Added Joel's wxchar.h for future Unicode adventures

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

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index 71a9fde5b39e6a362462af634b3138c1c8101ced..860e0b8d14dcc711e1a927bb60b3585099290b7b 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -49,15 +49,22 @@ public:
 
   int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
   wxMenuItem* FindMenuItemById( int id ) const;
 
   int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
   wxMenuItem* FindMenuItemById( int id ) const;

-  inline wxMenuItem* FindMenuItemForId( int id ) const
+  inline wxMenuItem* FindItemForId( int id ) const

     { return FindMenuItemById( id ); }
   
   void Check( int id, bool check );
   bool Checked( int id ) const;
   void Enable( int id, bool enable );
   bool Enabled( int id ) const;
     { return FindMenuItemById( id ); }
   
   void Check( int id, bool check );
   bool Checked( int id ) const;
   void Enable( int id, bool enable );
   bool Enabled( int id ) const;

-  inline bool IsEnabled(int Id) const { return Enabled(Id); };
-  inline bool IsChecked(int Id) const { return Checked(Id); };
+  inline bool IsEnabled(int Id) const { return Enabled(Id); }
+  inline bool IsChecked(int Id) const { return Checked(Id); }
+  
+  wxString GetLabel( int id ) const;
+  void SetLabel( int id, const wxString &label );
+  
+  void EnableTop( int pos, bool flag );
+  void SetLabelTop( int pos, const wxString& label );
+  wxString GetLabelTop( int pos ) const;

 
   int     GetMenuCount() const { return m_menus.Number(); }
   wxMenu *GetMenu(int n) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
 
   int     GetMenuCount() const { return m_menus.Number(); }
   wxMenu *GetMenu(int n) const { return (wxMenu *)m_menus.Nth(n)->Data(); }


@@ -102,7 +109,7 @@ public:
   bool IsChecked( int id ) const;
 
   void SetLabel( int id, const wxString &label );
   bool IsChecked( int id ) const;
 
   void SetLabel( int id, const wxString &label );

-  wxString GetLabel(int id) const;
+  wxString GetLabel( int id ) const;

 
   // helpstring
   virtual void SetHelpString(int id, const wxString& helpString);
 
   // helpstring
   virtual void SetHelpString(int id, const wxString& helpString);


@@ -133,6 +140,7 @@ public:
   void          *m_clientData;
 
   GtkWidget     *m_menu;  // GtkMenu
   void          *m_clientData;
 
   GtkWidget     *m_menu;  // GtkMenu

+  GtkWidget     *m_owner;

 };
 
 #endif // __GTKMENUH__
 };
 
 #endif // __GTKMENUH__