Capture/ReleaseMouse() prefixed with Do for the other ports (OS/2, MGL, Motif, Mac)

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

diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h
index 513d01e7347c814f015aec90aaadad6f2676fcd6..9a280522c9a4cb6f9c19e1e963699e2931d9da91 100644 (file)
--- a/include/wx/mac/window.h
+++ b/include/wx/mac/window.h
@@ -81,8 +81,6 @@ public:
     virtual void SetFocus();
 
     virtual void WarpPointer(int x, int y);
-    virtual void CaptureMouse();
-    virtual void ReleaseMouse();
 
     virtual void Refresh( bool eraseBackground = TRUE,
                           const wxRect *rect = (const wxRect *) NULL );
@@ -290,6 +288,9 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
+    virtual void DoCaptureMouse();
+    virtual void DoReleaseMouse();
+
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::MoveWindow() except for composite controls which will want to arrange

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 682d8fa2b5f6994c0a8edc789fc3c7a4fc0c4e08..053f038c7052a20fbe743df96a2e78bc8afa9058 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -62,8 +62,6 @@ public:
     virtual bool Reparent(wxWindowBase *newParent);
 
     virtual void WarpPointer(int x, int y);
-    virtual void CaptureMouse();
-    virtual void ReleaseMouse();
 
     virtual void Refresh(bool eraseBackground = TRUE,
                          const wxRect *rect = (const wxRect *) NULL);
@@ -128,6 +126,9 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
+    virtual void DoCaptureMouse();
+    virtual void DoReleaseMouse();
+
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::MoveWindow() except for composite controls which will want to arrange

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index e23aeda4421bab053c83425401ccf9d998243b51..0e3d3c0af8d1c4f234c93ab238c6e3d94360b066 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -63,8 +63,6 @@ public:
     virtual void SetFocus();
 
     virtual void WarpPointer(int x, int y);
-    virtual void CaptureMouse();
-    virtual void ReleaseMouse();
 
     virtual void Refresh( bool eraseBackground = TRUE,
                           const wxRect *rect = (const wxRect *) NULL );
@@ -317,6 +315,9 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
 
+    virtual void DoCaptureMouse();
+    virtual void DoReleaseMouse();
+
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index ab85057660a61137f0e326e86bff4e82894d6ab9..f7188ff8dc6a6fc2989e92f34768257ffaa7df5b 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -99,8 +99,6 @@ public:
     virtual void     WarpPointer( int x
                                  ,int y
                                 );
-    virtual void     CaptureMouse(void);
-    virtual void     ReleaseMouse(void);
     virtual void     Refresh( bool          bEraseBackground = TRUE
                              ,const wxRect* pRect = (const wxRect *)NULL
                             );
@@ -522,6 +520,9 @@ protected:
                                  ,int nHeight
                                 );
 
+    virtual void     DoCaptureMouse(void);
+    virtual void     DoReleaseMouse(void);
+
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::WinSetWindowPos() except for composite controls which will want to arrange

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 834c2cdc04d7a398c00b2923550ec1391f936016..8cd9a947a13bc43ef280ce29d89431aa8d81745d 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -254,7 +254,7 @@ bool wxWindowMac::Enable(bool enable)
     return TRUE;
 }
 
-void wxWindowMac::CaptureMouse()
+void wxWindowMac::DoCaptureMouse()
 {
     wxTheApp->s_captureWindow = this ;
 }
@@ -264,7 +264,7 @@ wxWindow* wxWindowBase::GetCapture()
     return wxTheApp->s_captureWindow ;
 }
 
-void wxWindowMac::ReleaseMouse()
+void wxWindowMac::DoReleaseMouse()
 {
     wxTheApp->s_captureWindow = NULL ;
 }

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 834c2cdc04d7a398c00b2923550ec1391f936016..8cd9a947a13bc43ef280ce29d89431aa8d81745d 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -254,7 +254,7 @@ bool wxWindowMac::Enable(bool enable)
     return TRUE;
 }
 
-void wxWindowMac::CaptureMouse()
+void wxWindowMac::DoCaptureMouse()
 {
     wxTheApp->s_captureWindow = this ;
 }
@@ -264,7 +264,7 @@ wxWindow* wxWindowBase::GetCapture()
     return wxTheApp->s_captureWindow ;
 }
 
-void wxWindowMac::ReleaseMouse()
+void wxWindowMac::DoReleaseMouse()
 {
     wxTheApp->s_captureWindow = NULL ;
 }

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 170bf9cb43e55740f5f0799b2b319c0f26d66862..64bef3e090f7e1a0af0cab0ab4cf0151e573ae20 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -709,7 +709,7 @@ void wxWindowMGL::Lower()
     MGL_wmLowerWindow(m_wnd);
 }
 
-void wxWindowMGL::CaptureMouse()
+void wxWindowMGL::DoCaptureMouse()
 {
     if ( gs_mouseCapture )
         MGL_wmUncaptureEvents(gs_mouseCapture->m_wnd, wxMGL_CAPTURE_MOUSE);
@@ -718,7 +718,7 @@ void wxWindowMGL::CaptureMouse()
     MGL_wmCaptureEvents(m_wnd, EVT_MOUSEEVT, wxMGL_CAPTURE_MOUSE);
 }
 
-void wxWindowMGL::ReleaseMouse()
+void wxWindowMGL::DoReleaseMouse()
 {
     wxASSERT_MSG( gs_mouseCapture == this, wxT("attempt to release mouse, but this window hasn't captured it") )
     

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 30a1b00391f53ddfa7531582d4c41b8c47cda0e9..d0a7035d95e80243e073812806ab805a3b8a5106 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -713,7 +713,7 @@ wxString wxWindow::GetTitle() const
     return wxString(title);
 }
 
-void wxWindow::CaptureMouse()
+void wxWindow::DoCaptureMouse()
 {
     g_captureWindow = this;
     if ( m_winCaptured )
@@ -726,7 +726,7 @@ void wxWindow::CaptureMouse()
     m_winCaptured = TRUE;
 }
 
-void wxWindow::ReleaseMouse()
+void wxWindow::DoReleaseMouse()
 {
     g_captureWindow = NULL;
     if ( !m_winCaptured )

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 695c0f3254860df7ba2297df066f042c59117f39..397b10c5580d632c63dc0a976899dbdc03a701ec 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -541,7 +541,7 @@ wxString wxWindowOS2::GetTitle() const
     return wxGetWindowText(GetHWND());
 } // end of wxWindowOS2::GetTitle
 
-void wxWindowOS2::CaptureMouse()
+void wxWindowOS2::DoCaptureMouse()
 {
     HWND                            hWnd = GetHwnd();
 
@@ -552,7 +552,7 @@ void wxWindowOS2::CaptureMouse()
     }
 } // end of wxWindowOS2::GetTitle
 
-void wxWindowOS2::ReleaseMouse()
+void wxWindowOS2::DoReleaseMouse()
 {
     if (m_bWinCaptured)
     {