Made some treectrl sample icons transparent; added toolbar.h to wx.h

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

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index eaced8f9902cc4d320c3bba9e258c5d87d6ba4d5..df414512df7b430b72e3bf3dc9be2752a920943b 100644 (file)
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -45,11 +45,16 @@ public:
 
     // 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 void IsChecked() const;
+    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()
@@ -60,9 +65,6 @@ public:
     // menu handle depending on what we're
     int GetRealId() const;
 
-    // delete the submenu
-    void DeleteSubMenu();
-
 private:
     DECLARE_DYNAMIC_CLASS(wxMenuItem)
 };