GUI thread update and event corrections.

[wxWidgets.git] / include / wx / msw / menuitem.h

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index e07225ee6ac2d5999f418601df840c131c6d45e7..df414512df7b430b72e3bf3dc9be2752a920943b 100644 (file)
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -45,12 +45,17 @@ public:
 
     // override base class virtuals
     virtual void SetText(const wxString& strName);
 
     // override base class virtuals
     virtual void SetText(const wxString& strName);

+    virtual wxString GetLabel() const;

     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool bDoEnable = TRUE);
     virtual void Check(bool bDoCheck = TRUE);
     virtual bool IsChecked() const;
 
     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool bDoEnable = TRUE);
     virtual void Check(bool bDoCheck = TRUE);
     virtual bool IsChecked() const;
 

+#if wxUSE_ACCEL
+    virtual wxAcceleratorEntry *GetAccel() const;
+#endif // wxUSE_ACCEL
+

     // unfortunately needed to resolve ambiguity between
     // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
     bool IsCheckable() const { return wxMenuItemBase::IsCheckable(); }
     // unfortunately needed to resolve ambiguity between
     // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
     bool IsCheckable() const { return wxMenuItemBase::IsCheckable(); }


@@ -60,9 +65,6 @@ public:
     // menu handle depending on what we're
     int GetRealId() const;
 
     // menu handle depending on what we're
     int GetRealId() const;
 

-    // delete the submenu
-    void DeleteSubMenu();
-

 private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };