compilation/linking fixes for DoCaptureMouse() change

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 78cf266257dd70d345de21bcfd2493696aaa6b23..c32af380e28ca6311367ffdb1744a1a141848e3f 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -268,9 +268,6 @@ private:
     wxScrollBar *m_scrollbarHorz,
                 *m_scrollbarVert;
 
     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;
 #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 b84b83dd60300beac811eb11a3f9ca32eebce7e5..905327ad1ac2562ed5e82822ae3490c668bd0ae7 100644 (file)
--- 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 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;
 
     // 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;
 
     // 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()
     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 bd4ec6de1e3897b3def2d833a25709603bbdb86b..a72ede3d9ffe098f0ace7bcfaf5680c84f435e1f 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1622,7 +1622,7 @@ struct WXDLLEXPORT wxWindowNext
     wxWindowNext *next;
 } *wxWindow::ms_winCaptureNext = NULL;
 
     wxWindowNext *next;
 } *wxWindow::ms_winCaptureNext = NULL;
 

-void wxWindow::CaptureMouse()
+void wxWindowBase::CaptureMouse()

 {
     wxLogTrace(_T("mousecapture"), _T("CaptureMouse(0x%08x)"), this);
 
 {
     wxLogTrace(_T("mousecapture"), _T("CaptureMouse(0x%08x)"), this);
 


@@ -1640,7 +1640,7 @@ void wxWindow::CaptureMouse()
     DoCaptureMouse();
 }
 
     DoCaptureMouse();
 }
 

-void wxWindow::ReleaseMouse()
+void wxWindowBase::ReleaseMouse()

 {
     DoReleaseMouse();
 
 {
     DoReleaseMouse();