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

don't pass window argument to NotifyCaptureLost, it's not needed/used

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2006-07-31 12:17:39 +00:00
parent 2c5e5cbdb4
commit 72f8c79220
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/window.h
View File

@ -1329,9 +1329,8 @@ protected:
virtual void DoSetWindowVariant( wxWindowVariant variant ) ; virtual void DoSetWindowVariant( wxWindowVariant variant ) ;
// Must be called when mouse capture is lost to send // Must be called when mouse capture is lost to send
// wxMouseCaptureLostEvent to windows on capture stack. The argument is // wxMouseCaptureLostEvent to windows on capture stack.
// the window gaining capture or NULL if outside of wx code or none. static void NotifyCaptureLost();
static void NotifyCaptureLost(wxWindow *gainedCapture);
private: private:
// contains the last id generated by NewControlId // contains the last id generated by NewControlId

2
src/common/wincmn.cpp
View File

@ -2406,7 +2406,7 @@ static void DoNotifyWindowAboutCaptureLost(wxWindow *win)
} }
/* static */ /* static */
void wxWindowBase::NotifyCaptureLost(wxWindow *gainedCapture) void wxWindowBase::NotifyCaptureLost()
{ {
// don't do anything if capture lost was expected, i.e. resulted from // don't do anything if capture lost was expected, i.e. resulted from
// a wx call to ReleaseMouse or CaptureMouse: // a wx call to ReleaseMouse or CaptureMouse:

5
src/msw/window.cpp
View File

@ -4107,12 +4107,11 @@ bool wxWindowMSW::HandlePaletteChanged(WXHWND hWndPalChange)
bool wxWindowMSW::HandleCaptureChanged(WXHWND hWndGainedCapture) bool wxWindowMSW::HandleCaptureChanged(WXHWND hWndGainedCapture)
{ {
wxWindow *win = wxFindWinFromHandle(hWndGainedCapture);
// notify windows on the capture stack about lost capture // notify windows on the capture stack about lost capture
// (see http://sourceforge.net/tracker/index.php?func=detail&aid=1153662&group_id=9863&atid=109863): // (see http://sourceforge.net/tracker/index.php?func=detail&aid=1153662&group_id=9863&atid=109863):
wxWindowBase::NotifyCaptureLost(win); wxWindowBase::NotifyCaptureLost();
wxWindow *win = wxFindWinFromHandle(hWndGainedCapture);
wxMouseCaptureChangedEvent event(GetId(), win); wxMouseCaptureChangedEvent event(GetId(), win);
event.SetEventObject(this); event.SetEventObject(this);
return GetEventHandler()->ProcessEvent(event); return GetEventHandler()->ProcessEvent(event);