X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ed946f2835520aeae67c69582c068bf2e109008..74af0b13434f4fa5c814a19a6d325d271944accf:/include/wx/gtk/menu.h

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index b73dfc1c13..506d1986c0 100644
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -21,7 +21,6 @@ public:
     wxMenuBar();
     wxMenuBar(long style);
     wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
-    virtual ~wxMenuBar();
 
     // implement base class (pure) virtuals
     virtual bool Append( wxMenu *menu, const wxString &title );
@@ -44,19 +43,16 @@ public:
     // window
     virtual bool GTKNeedsParent() const { return false; }
 
-    void Attach(wxFrame *frame);
+    virtual void Attach(wxFrame *frame);
+    virtual void Detach();
 
     // implementation only from now on
-    void SetInvokingWindow( wxWindow *win );
-    void UnsetInvokingWindow( wxWindow *win );
+    GtkWidget       *m_menubar; // Public for hildon support
 
 private:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
-    GtkWidget       *m_menubar;
-    wxWindow        *m_invokingWindow;
-
     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
@@ -82,10 +78,10 @@ public:
     void SetLayoutDirection(const wxLayoutDirection dir);
     wxLayoutDirection GetLayoutDirection() const;
 
-    // TODO: virtual void SetTitle(const wxString& title);
+    // Returns the title, with mnemonics translated to wx format
+    wxString GetTitle() const;
 
-    // implementation
-    int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
+    // TODO: virtual void SetTitle(const wxString& title);
 
     // implementation GTK only
     GtkWidget       *m_menu;  // GtkMenu