Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index 32136bdd096e18c12f292e3a5c994f93d7a72051..aca498bcc29b92957842a038a007e418e9e08768 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -37,17 +37,15 @@ public:
     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;
 

-    // implementation only from now on
-    void SetInvokingWindow( wxWindow *win );
-    void UnsetInvokingWindow( wxWindow *win );
-

     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 

+    virtual void Attach(wxFrame *frame);
+    virtual void Detach();
+

     GtkAccelGroup   *m_accel;
     GtkWidget       *m_menubar;
     long             m_style;
     GtkAccelGroup   *m_accel;
     GtkWidget       *m_menubar;
     long             m_style;

-    wxWindow        *m_invokingWindow;

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


@@ -75,6 +73,9 @@ public:
     virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
     virtual wxMenuItem* DoRemove(wxMenuItem *item);
 
     virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
     virtual wxMenuItem* DoRemove(wxMenuItem *item);
 

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

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