Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation/linking fixes for DoCaptureMouse() change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-19 19:39:53 +00:00
parent 4116c22156
commit a83e14751f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/univ/window.h
View File

@@ -268,9 +268,6 @@ private:
wxScrollBar *m_scrollbarHorz, wxScrollBar *m_scrollbarHorz,
*m_scrollbarVert; *m_scrollbarVert;
// the stack of windows which have captured the mouse
static struct WXDLLEXPORT wxWindowNext *ms_winCaptureNext;
#if wxUSE_MENUS #if wxUSE_MENUS
// the current modal event loop for the popup menu we show or NULL // the current modal event loop for the popup menu we show or NULL
static wxEventLoop *ms_evtLoopPopup; static wxEventLoop *ms_evtLoopPopup;

7
include/wx/window.h
View File

@@ -887,8 +887,8 @@ protected:
virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const; virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const;
// capture/release the mouse, used by Capture/ReleaseMouse() // capture/release the mouse, used by Capture/ReleaseMouse()
virtual void DoCaptureMouse(); virtual void DoCaptureMouse() = 0;
virtual void DoReleaseMouse(); virtual void DoReleaseMouse() = 0;
// retrieve the position/size of the window // retrieve the position/size of the window
virtual void DoGetPosition( int *x, int *y ) const = 0; virtual void DoGetPosition( int *x, int *y ) const = 0;
@@ -932,6 +932,9 @@ private:
// contains the last id generated by NewControlId // contains the last id generated by NewControlId
static int ms_lastControlId; static int ms_lastControlId;
// the stack of windows which have captured the mouse
static struct WXDLLEXPORT wxWindowNext *ms_winCaptureNext;
DECLARE_ABSTRACT_CLASS(wxWindowBase) DECLARE_ABSTRACT_CLASS(wxWindowBase)
DECLARE_NO_COPY_CLASS(wxWindowBase) DECLARE_NO_COPY_CLASS(wxWindowBase)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

4
src/common/wincmn.cpp
View File

@@ -1622,7 +1622,7 @@ struct WXDLLEXPORT wxWindowNext
wxWindowNext *next; wxWindowNext *next;
} *wxWindow::ms_winCaptureNext = NULL; } *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();