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

use wxWindowBase, not wxWindow, in wxUpdateUIEvent::CanUpdate() (wxUniv compilation fix)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-08-02 00:12:39 +00:00
parent 26ab89ad4d
commit a7bc03c94b
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/event.h
View File

@@ -39,6 +39,7 @@ class WXDLLIMPEXP_BASE wxList;
class WXDLLIMPEXP_CORE wxDC; class WXDLLIMPEXP_CORE wxDC;
class WXDLLIMPEXP_CORE wxMenu; class WXDLLIMPEXP_CORE wxMenu;
class WXDLLIMPEXP_CORE wxWindow; class WXDLLIMPEXP_CORE wxWindow;
class WXDLLIMPEXP_CORE wxWindowBase;
#endif // wxUSE_GUI #endif // wxUSE_GUI
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1643,7 +1644,7 @@ public:
static long GetUpdateInterval() { return sm_updateInterval; } static long GetUpdateInterval() { return sm_updateInterval; }
// Can we update this window? // Can we update this window?
static bool CanUpdate(wxWindow* win) ; static bool CanUpdate(wxWindowBase *win);
// Reset the update time to provide a delay until the next // Reset the update time to provide a delay until the next
// time we should update // time we should update

2
src/common/event.cpp
View File

@@ -390,7 +390,7 @@ long wxUpdateUIEvent::sm_updateInterval = 0;
wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL; wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL;
// Can we update? // Can we update?
bool wxUpdateUIEvent::CanUpdate(wxWindow* win) bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win)
{ {
// Don't update if we've switched global updating off // Don't update if we've switched global updating off
// and this window doesn't support updates. // and this window doesn't support updates.