Attempted to fix splittree problem by not pushing event handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -62,7 +62,7 @@ public:
|
||||
// window (e.g. a child of it in order to scroll only a portion
|
||||
// the area between the scrollbars (spreadsheet: only cell area
|
||||
// will move).
|
||||
virtual void SetTargetWindow( wxWindow *target );
|
||||
virtual void SetTargetWindow( wxWindow *target, bool pushEventHandler = FALSE );
|
||||
virtual wxWindow *GetTargetWindow();
|
||||
|
||||
// Number of pixels per user unit (0 or -1 for no scrollbar)
|
||||
|
@@ -62,7 +62,7 @@ public:
|
||||
// window (e.g. a child of it in order to scroll only a portion
|
||||
// the area between the scrollbars (spreadsheet: only cell area
|
||||
// will move).
|
||||
virtual void SetTargetWindow( wxWindow *target );
|
||||
virtual void SetTargetWindow( wxWindow *target, bool pushEventHandler = FALSE );
|
||||
virtual wxWindow *GetTargetWindow();
|
||||
|
||||
// Number of pixels per user unit (0 or -1 for no scrollbar)
|
||||
|
@@ -74,6 +74,23 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// PlaySound
|
||||
|
||||
#ifdef PlaySound
|
||||
#undef PlaySound
|
||||
#ifdef _UNICODE
|
||||
inline BOOL PlaySound(LPCWSTR pszSound, HMODULE hMod, DWORD fdwSound)
|
||||
{
|
||||
return PlaySoundW(pszSound, hMod, fdwSound);
|
||||
}
|
||||
#else
|
||||
inline BOOL PlaySound(LPCSTR pszSound, HMODULE hMod, DWORD fdwSound)
|
||||
{
|
||||
return PlaySoundA(pszSound, hMod, fdwSound);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// GetClassName
|
||||
|
||||
#ifdef GetClassName
|
||||
|
@@ -80,7 +80,7 @@ public:
|
||||
// occasions you might want it to scroll [part of] another window (e.g. a
|
||||
// child of it in order to scroll only a portion the area between the
|
||||
// scrollbars (spreadsheet: only cell area will move).
|
||||
virtual void SetTargetWindow(wxWindow *target);
|
||||
virtual void SetTargetWindow(wxWindow *target, bool pushEventHandler = FALSE);
|
||||
virtual wxWindow *GetTargetWindow() const;
|
||||
|
||||
void SetTargetRect(const wxRect& rect) { m_rectToScroll = rect; }
|
||||
@@ -146,7 +146,7 @@ protected:
|
||||
|
||||
// change just the target window (unlike SetWindow which changes m_win as
|
||||
// well)
|
||||
void DoSetTargetWindow(wxWindow *target);
|
||||
void DoSetTargetWindow(wxWindow *target, bool pushEventHandler = FALSE);
|
||||
|
||||
// delete the event handler we installed
|
||||
void DeleteEvtHandler();
|
||||
|
Reference in New Issue
Block a user