wxGTK compiles (and seems to work) again after wxMenu changes

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

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index 8152ab4d6af51ce867db77647c45ba3b54114f7c..ba846a4b9c43f1940541494c3f24458c21bff95d 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -30,14 +30,20 @@ public:
     ~wxMenuItem();
 
     // implement base class virtuals
     ~wxMenuItem();
 
     // implement base class virtuals

-    virtual void SetText( const wxString& str ) { DoSetText(str); }
+    virtual void SetText( const wxString& str );
+    virtual wxString GetLabel() const;

     virtual void Enable( bool enable = TRUE );
     virtual void Check( bool check = TRUE );
     virtual bool IsChecked() const;
 
     virtual void Enable( bool enable = TRUE );
     virtual void Check( bool check = TRUE );
     virtual bool IsChecked() const;
 

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

     // implementation
     void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
     GtkWidget *GetMenuItem() const { return m_menuItem; }
     // implementation
     void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
     GtkWidget *GetMenuItem() const { return m_menuItem; }

+    wxString GetFactoryPath() const;

 
     wxString GetHotKey() const { return m_hotKey; }
 
 
     wxString GetHotKey() const { return m_hotKey; }