From a83e14751f3b4bb86da3ac2edea09c7f78f3ca3e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 19 Jan 2002 19:39:53 +0000 Subject: [PATCH] compilation/linking fixes for DoCaptureMouse() change git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/univ/window.h | 3 --- include/wx/window.h | 7 +++++-- src/common/wincmn.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h index 78cf266257..c32af380e2 100644 --- a/include/wx/univ/window.h +++ b/include/wx/univ/window.h @@ -268,9 +268,6 @@ private: wxScrollBar *m_scrollbarHorz, *m_scrollbarVert; - // the stack of windows which have captured the mouse - static struct WXDLLEXPORT wxWindowNext *ms_winCaptureNext; - #if wxUSE_MENUS // the current modal event loop for the popup menu we show or NULL static wxEventLoop *ms_evtLoopPopup; diff --git a/include/wx/window.h b/include/wx/window.h index b84b83dd60..905327ad1a 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -887,8 +887,8 @@ protected: virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const; // capture/release the mouse, used by Capture/ReleaseMouse() - virtual void DoCaptureMouse(); - virtual void DoReleaseMouse(); + virtual void DoCaptureMouse() = 0; + virtual void DoReleaseMouse() = 0; // retrieve the position/size of the window virtual void DoGetPosition( int *x, int *y ) const = 0; @@ -932,6 +932,9 @@ private: // contains the last id generated by NewControlId static int ms_lastControlId; + // the stack of windows which have captured the mouse + static struct WXDLLEXPORT wxWindowNext *ms_winCaptureNext; + DECLARE_ABSTRACT_CLASS(wxWindowBase) DECLARE_NO_COPY_CLASS(wxWindowBase) DECLARE_EVENT_TABLE() diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index bd4ec6de1e..a72ede3d9f 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -1622,7 +1622,7 @@ struct WXDLLEXPORT wxWindowNext wxWindowNext *next; } *wxWindow::ms_winCaptureNext = NULL; -void wxWindow::CaptureMouse() +void wxWindowBase::CaptureMouse() { wxLogTrace(_T("mousecapture"), _T("CaptureMouse(0x%08x)"), this); @@ -1640,7 +1640,7 @@ void wxWindow::CaptureMouse() DoCaptureMouse(); } -void wxWindow::ReleaseMouse() +void wxWindowBase::ReleaseMouse() { DoReleaseMouse(); -- 2.45.2