diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2016-01-15 19:52:09 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-01-16 17:07:36 +0000 |
| commit | cb71841a31404fdbe4df76d9473ee73c2fa8554b (patch) | |
| tree | 69bb080fd576344c22a4006eee9f3d9eac92a818 /vcl/inc | |
| parent | 1ae5ceccb818b46f36433c7820e18039f13e56ac (diff) | |
tdf#78431: Clean up pFrame parameter in ImplWindowFrameProc
Change-Id: I441c1b89a975fa7d31094e66ef3ccad37ce40818
Reviewed-on: https://gerrit.libreoffice.org/21497
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/salframe.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/salwtype.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/window.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index c08486f5118c..e562acdaa820 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -248,7 +248,6 @@ public: return false; } - // Callbacks (indepent part in vcl/source/window/winproc.cxx) // for default message handling return 0 void SetCallback( vcl::Window* pWindow, SALFRAMEPROC pProc ); @@ -260,7 +259,7 @@ public: // that should not know more than necessary about the SalFrame implementation // (e.g. input methods, printer update handlers). long CallCallback( sal_uInt16 nEvent, const void* pEvent ) const - { return m_pProc ? long(m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent )) : 0; } + { return m_pProc ? long(m_pProc( m_pWindow, nEvent, pEvent )) : 0; } bool PaintsBlocked() const { return m_bPaintsBlocked; } }; diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 5400dfb7a0f7..c98994f37769 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -227,8 +227,7 @@ struct SalQueryCharPositionEvent // - SalFrame-Types - -typedef bool (*SALFRAMEPROC)( vcl::Window* pInst, SalFrame* pFrame, - sal_uInt16 nEvent, const void* pEvent ); +typedef bool (*SALFRAMEPROC)( vcl::Window* pInst, sal_uInt16 nEvent, const void* pEvent ); // - SalObject-Events - diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 25719ac4f552..3fed5b3c6d86 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -93,7 +93,7 @@ namespace dnd { class XDropTarget; }}}}} -bool ImplWindowFrameProc( vcl::Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent ); +bool ImplWindowFrameProc( vcl::Window* pInst, sal_uInt16 nEvent, const void* pEvent ); #define WINDOW_HITTEST_INSIDE ((sal_uInt16)0x0001) #define WINDOW_HITTEST_TRANSPARENT ((sal_uInt16)0x0002) |