Fixed wxWindowOS2::Reparent.

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

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index 9a2d3a80f91a5dfe66836bb0be7291638e19b5e1..32136bdd096e18c12f292e3a5c994f93d7a72051 100644 (file)
--- 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$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -34,8 +34,8 @@ 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 void SetLabelTop( size_t pos, const wxString& label );
-    virtual wxString GetLabelTop( 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 );
 
     // implementation only from now on
     void SetInvokingWindow( wxWindow *win );


@@ -44,9 +44,7 @@ public:
     // 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);
 

-#ifndef __WXGTK20__

     GtkAccelGroup   *m_accel;
     GtkAccelGroup   *m_accel;

-#endif

     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;


@@ -94,9 +92,10 @@ private:
     // common part of Append (if pos == -1)  and Insert
     bool GtkAppend(wxMenuItem *item, int pos=-1);
 
     // 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)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 

-#endif // __GTKMENUH__
+#endif
+    // __GTKMENUH__