wxUpdateUIEvent derives from wxCommandEvent now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index 0ddc69857378b472c8090ce61c2882c37590ebcd..1c58d1541c7749c0de0089e748d599d471d99cb6 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -863,7 +863,7 @@ protected:
 class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxWindow;
 

-class WXDLLEXPORT wxUpdateUIEvent: public wxEvent
+class WXDLLEXPORT wxUpdateUIEvent: public wxCommandEvent

 {
   DECLARE_DYNAMIC_CLASS(wxUpdateUIEvent)
 
 {
   DECLARE_DYNAMIC_CLASS(wxUpdateUIEvent)
 

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 2cc283f10d935f2f5c47e08efa36ce090c6b3859..14278f5373be5d5de686dcf739b501888a9a38ee 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -54,7 +54,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)

-IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)

 IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 4bb0019e0df72162a576fd1dac1192b9f3a296db..81b17c2b13d91bc9f8201d33b1913919512f045d 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -439,7 +439,6 @@ wxBitmapList::wxBitmapList ()
 
 wxBitmapList::~wxBitmapList ()
 {
 
 wxBitmapList::~wxBitmapList ()
 {

-  wxLogDebug("~wxBitmapList: count = %d", Number());

 #ifdef __WXMSW__
 
   wxNode *node = First ();
 #ifdef __WXMSW__
 
   wxNode *node = First ();