diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-01 14:27:21 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-12-05 12:11:18 +0100 |
| commit | 98973b61b124ae20905985e2c9707c7036bd0e26 (patch) | |
| tree | ca0406b7fe6ec9b099160cf04b8a098b6aa9f297 /libreofficekit | |
| parent | e7cc1b8c21d6161932220286b16968a831a652cb (diff) | |
lokdialog: Merge dialog & dialog child mouse event APIs into one
Change-Id: I91aaa6a58f33dd2d817e02533de96e0c8191f2ca
Diffstat (limited to 'libreofficekit')
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx index b5d97805f9bc..5770e1349305 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx @@ -162,7 +162,7 @@ gtv_lok_dialog_signal_button(GtkWidget* pDialogDrawingArea, GdkEventButton* pEve break; } priv->m_nLastButtonPressed = nEventButton; - pDocument->pClass->postDialogMouseEvent(pDocument, + pDocument->pClass->postWindowMouseEvent(pDocument, priv->dialogid, LOK_MOUSEEVENT_MOUSEBUTTONDOWN, (pEvent->x), @@ -193,7 +193,7 @@ gtv_lok_dialog_signal_button(GtkWidget* pDialogDrawingArea, GdkEventButton* pEve break; } priv->m_nLastButtonPressed = nEventButton; - pDocument->pClass->postDialogMouseEvent(pDocument, + pDocument->pClass->postWindowMouseEvent(pDocument, priv->dialogid, LOK_MOUSEEVENT_MOUSEBUTTONUP, (pEvent->x), @@ -223,7 +223,7 @@ gtv_lok_dialog_signal_motion(GtkWidget* pDialogDrawingArea, GdkEventButton* pEve (int)pixelToTwip(pEvent->x), (int)pixelToTwip(pEvent->y)); - pDocument->pClass->postDialogMouseEvent(pDocument, + pDocument->pClass->postWindowMouseEvent(pDocument, priv->dialogid, LOK_MOUSEEVENT_MOUSEMOVE, (pEvent->x), @@ -541,14 +541,14 @@ gtv_lok_dialog_floating_win_signal_button(GtkWidget* /*pDialogChildDrawingArea*/ break; } priv->m_nChildLastButtonPressed = nEventButton; - pDocument->pClass->postDialogChildMouseEvent(pDocument, - priv->m_nChildId, - LOK_MOUSEEVENT_MOUSEBUTTONDOWN, - (pEvent->x), - (pEvent->y), - nCount, - nEventButton, - priv->m_nChildKeyModifier); + pDocument->pClass->postWindowMouseEvent(pDocument, + priv->m_nChildId, + LOK_MOUSEEVENT_MOUSEBUTTONDOWN, + (pEvent->x), + (pEvent->y), + nCount, + nEventButton, + priv->m_nChildKeyModifier); break; } @@ -572,14 +572,14 @@ gtv_lok_dialog_floating_win_signal_button(GtkWidget* /*pDialogChildDrawingArea*/ break; } priv->m_nChildLastButtonPressed = nEventButton; - pDocument->pClass->postDialogChildMouseEvent(pDocument, - priv->m_nChildId, - LOK_MOUSEEVENT_MOUSEBUTTONUP, - (pEvent->x), - (pEvent->y), - nCount, - nEventButton, - priv->m_nChildKeyModifier); + pDocument->pClass->postWindowMouseEvent(pDocument, + priv->m_nChildId, + LOK_MOUSEEVENT_MOUSEBUTTONUP, + (pEvent->x), + (pEvent->y), + nCount, + nEventButton, + priv->m_nChildKeyModifier); break; } default: @@ -602,14 +602,14 @@ gtv_lok_dialog_floating_win_signal_motion(GtkWidget* /*pDialogDrawingArea*/, Gdk (int)pixelToTwip(pEvent->x), (int)pixelToTwip(pEvent->y)); - pDocument->pClass->postDialogChildMouseEvent(pDocument, - priv->m_nChildId, - LOK_MOUSEEVENT_MOUSEMOVE, - (pEvent->x), - (pEvent->y), - 1, - priv->m_nChildLastButtonPressed, - priv->m_nChildKeyModifier); + pDocument->pClass->postWindowMouseEvent(pDocument, + priv->m_nChildId, + LOK_MOUSEEVENT_MOUSEMOVE, + (pEvent->x), + (pEvent->y), + 1, + priv->m_nChildLastButtonPressed, + priv->m_nChildKeyModifier); return FALSE; } |