fixed wxComboBox::Clear to clear stored value

[wxWidgets.git] / include / wx / menu.h

diff --git a/include/wx/menu.h b/include/wx/menu.h
index be2b692a1aaaa9818ef2772bae87b90006095bd2..5e31cede132774c4921df014c6610dd24d864930 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MENU_H_BASE_
 #define _WX_MENU_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "menubase.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_MENUS
@@ -450,6 +446,7 @@ public:
     void Check(int itemid, bool check);
     bool IsChecked(int itemid) const;
     bool IsEnabled(int itemid) const;
+    virtual bool IsEnabled() const { return wxWindow::IsEnabled(); }
 
     void SetLabel(int itemid, const wxString &label);
     wxString GetLabel(int itemid) const;
@@ -479,6 +476,9 @@ public:
     // don't want menu bars to accept the focus by tabbing to them
     virtual bool AcceptsFocusFromKeyboard() const { return false; }
 
+    // update all menu item states in all menus
+    virtual void UpdateMenus();
+
 protected:
     // the list of all our menus
     wxMenuList m_menus;
@@ -498,6 +498,8 @@ protected:
 #else // !wxUSE_BASE_CLASSES_ONLY
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/menu.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/menu.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/menu.h"
 #elif defined(__WXMOTIF__)