removing outdated code

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 06eaca1e5446b02c597261397c5e212eccf48ad2..92bb3146d419d50f3bd297e4fcdfe7006e449239 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -21,6 +21,7 @@ public:
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);

+    ~wxMenuBar();

 
     // implement base class (pure) virtuals
     virtual bool Append( wxMenu *menu, const wxString &title );
 
     // implement base class (pure) virtuals
     virtual bool Append( wxMenu *menu, const wxString &title );


@@ -33,6 +34,7 @@ public:
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );

+    virtual bool IsEnabledTop(size_t pos) const;

     virtual void SetMenuLabel( size_t pos, const wxString& label );
     virtual wxString GetMenuLabel( size_t pos ) const;
 
     virtual void SetMenuLabel( size_t pos, const wxString& label );
     virtual wxString GetMenuLabel( size_t pos ) const;
 


@@ -51,7 +53,7 @@ public:
 
 private:
     // common part of Append and Insert
 
 private:
     // common part of Append and Insert

-    bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
+    void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1);

 
     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 
 
     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 


@@ -78,6 +80,9 @@ public:
     void SetLayoutDirection(const wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 
     void SetLayoutDirection(const wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 

+    // Returns the title, with mnemonics translated to wx format
+    wxString GetTitle() const;
+

     // TODO: virtual void SetTitle(const wxString& title);
 
     // implementation GTK only
     // TODO: virtual void SetTitle(const wxString& title);
 
     // implementation GTK only


@@ -96,9 +101,8 @@ private:
     void Init();
 
     // common part of Append (if pos == -1)  and Insert
     void Init();
 
     // common part of Append (if pos == -1)  and Insert

-    bool GtkAppend(wxMenuItem *item, int pos=-1);
+    void GtkAppend(wxMenuItem* item, int pos = -1);

 
 

-    GtkWidget *m_prevRadio;

 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };