Kaydet (Commit) 2bb28265 authored tarafından Noel Grandin's avatar Noel Grandin

SalFrame Handle* methods can return bool

Change-Id: Ia28463e1c83aa496e8c389d1614f9b8a78100994
Reviewed-on: https://gerrit.libreoffice.org/41209Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 963ebd4f
......@@ -272,8 +272,8 @@ public:
// Call the callback set; this sometimes necessary for implementation classes
// that should not know more than necessary about the SalFrame implementation
// (e.g. input methods, printer update handlers).
long CallCallback( SalEvent nEvent, const void* pEvent ) const
{ return m_pProc ? long(m_pProc( m_pWindow, nEvent, pEvent )) : 0; }
bool CallCallback( SalEvent nEvent, const void* pEvent ) const
{ return m_pProc && m_pProc( m_pWindow, nEvent, pEvent ); }
};
#ifdef _WIN32
......
......@@ -546,7 +546,7 @@ public:
//to GtkData to rethrow them after the gsignal is processed when its safe
//to do so again in our own code after the g_main_context_iteration call
//which triggers the gsignals.
long CallCallbackExc(SalEvent nEvent, const void* pEvent) const;
bool CallCallbackExc(SalEvent nEvent, const void* pEvent) const;
static void KeyCodeToGdkKey(const vcl::KeyCode& rKeyCode,
......
......@@ -146,14 +146,14 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl
void RestackChildren( ::Window* pTopLevelWindows, int nTopLevelWindows );
void RestackChildren();
long HandleKeyEvent ( XKeyEvent *pEvent );
long HandleMouseEvent ( XEvent *pEvent );
long HandleFocusEvent ( XFocusChangeEvent const *pEvent );
long HandleExposeEvent ( XEvent *pEvent );
long HandleSizeEvent ( XConfigureEvent *pEvent );
long HandleStateEvent ( XPropertyEvent *pEvent );
long HandleReparentEvent ( XReparentEvent *pEvent );
long HandleClientMessage ( XClientMessageEvent*pEvent );
bool HandleKeyEvent ( XKeyEvent *pEvent );
bool HandleMouseEvent ( XEvent *pEvent );
bool HandleFocusEvent ( XFocusChangeEvent const *pEvent );
bool HandleExposeEvent ( XEvent *pEvent );
bool HandleSizeEvent ( XConfigureEvent *pEvent );
bool HandleStateEvent ( XPropertyEvent *pEvent );
bool HandleReparentEvent ( XReparentEvent *pEvent );
bool HandleClientMessage ( XClientMessageEvent*pEvent );
DECL_LINK( HandleAlwaysOnTopRaise, Timer*, void );
......@@ -168,7 +168,7 @@ public:
X11SalFrame( SalFrame* pParent, SalFrameStyleFlags nSalFrameStyle, SystemParentData* pSystemParent = nullptr );
virtual ~X11SalFrame() override;
long Dispatch( XEvent *pEvent );
bool Dispatch( XEvent *pEvent );
void Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nScreen,
SystemParentData* pParentData, bool bUseGeometry = false );
......
......@@ -4332,9 +4332,9 @@ void GtkSalFrame::signalDragDataGet(GtkWidget* /*widget*/, GdkDragContext* /*con
pThis->m_pDragSource->dragDataGet(data, info);
}
long GtkSalFrame::CallCallbackExc(SalEvent nEvent, const void* pEvent) const
bool GtkSalFrame::CallCallbackExc(SalEvent nEvent, const void* pEvent) const
{
long nRet = 0;
bool nRet = false;
try
{
nRet = CallCallback(nEvent, pEvent);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment