From 4116c2215676be5c8372276fa133e9d5dba5efce Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 19 Jan 2002 19:38:46 +0000 Subject: [PATCH] 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 --- include/wx/mac/window.h | 5 +++-- include/wx/mgl/window.h | 5 +++-- include/wx/motif/window.h | 5 +++-- include/wx/os2/window.h | 5 +++-- src/mac/carbon/window.cpp | 4 ++-- src/mac/window.cpp | 4 ++-- src/mgl/window.cpp | 4 ++-- src/motif/window.cpp | 4 ++-- src/os2/window.cpp | 4 ++-- 9 files changed, 22 insertions(+), 18 deletions(-) diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h index 513d01e734..9a280522c9 100644 --- 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 682d8fa2b5..053f038c70 100644 --- 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 e23aeda442..0e3d3c0af8 100644 --- 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 ab85057660..f7188ff8dc 100644 --- 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 834c2cdc04..8cd9a947a1 100644 --- 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 834c2cdc04..8cd9a947a1 100644 --- 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 170bf9cb43..64bef3e090 100644 --- 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 30a1b00391..d0a7035d95 100644 --- 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 695c0f3254..397b10c558 100644 --- 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) { -- 2.45.2