X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..676184202dbb8fd7a5c0818adac1db295eed2278:/include/wx/gtk1/menu.h

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index 9a2d3a80f9..ce9b60299c 100644
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/menu.h
+// Name:        wx/gtk1/menu.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -34,22 +34,18 @@ public:
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );
-    virtual void SetLabelTop( size_t pos, const wxString& label );
-    virtual wxString GetLabelTop( size_t pos ) const;
-
-    // implementation only from now on
-    void SetInvokingWindow( wxWindow *win );
-    void UnsetInvokingWindow( wxWindow *win );
+    virtual void SetMenuLabel( size_t pos, const wxString& label );
+    virtual wxString GetMenuLabel( size_t pos ) const;
 
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
-#ifndef __WXGTK20__
+    virtual void Attach(wxFrame *frame);
+    virtual void Detach();
+
     GtkAccelGroup   *m_accel;
-#endif
     GtkWidget       *m_menubar;
     long             m_style;
-    wxWindow        *m_invokingWindow;
 
 private:
     void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
@@ -94,9 +90,10 @@ private:
     // common part of Append (if pos == -1)  and Insert
     bool GtkAppend(wxMenuItem *item, int pos=-1);
 
-	GtkWidget *m_prevRadio;
+    GtkWidget *m_prevRadio;
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
-#endif // __GTKMENUH__
+#endif
+    // __GTKMENUH__