Fixes, typos etc...

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 5ce6c353ccfb0ed90a347f89ab180e7d2aaea5ed..9258a25e8570b3595ba21169f984f86c87c91cac 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -93,13 +93,14 @@ public:
   bool IsSubMenu() const { return m_subMenu != NULL; }
 
     // state
-  void Enable(bool enable = TRUE) { m_isEnabled = enable; }
+  void Enable( bool enable = TRUE ); 
   bool IsEnabled() const { return m_isEnabled; }
-  void Check(bool check = TRUE);
+  void Check( bool check = TRUE );
   bool IsChecked() const;
 
     // help string (displayed in the status bar by default)
-  void SetHelpString(const wxString& str) { m_helpStr = str; }
+  void SetHelp(const wxString& str) { m_helpStr = str; }
+  const wxString& GetHelp() const { return m_helpStr; }
 
   // implementation
   void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
@@ -123,9 +124,12 @@ DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:
   // construction
-  wxMenu( const wxString& title = wxEmptyString, const wxFunction func = NULL );
+  wxMenu( const wxString& title = wxEmptyString, const wxFunction func = (wxFunction) NULL );
 
   // operations
+    // title
+  void SetTitle(const wxString& label);
+  const wxString GetTitle() const;
     // menu creation
   void AppendSeparator();
   void Append(int id, const wxString &item,
@@ -136,7 +140,8 @@ public:
 
     // find item by name/id
   int FindItem( const wxString itemString ) const;
-  wxMenuItem *FindItem(int id) const;
+  wxMenuItem *FindItem( int id ) const;
+  wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
 
     // get/set item's state
   void Enable( int id, bool enable );
@@ -145,7 +150,12 @@ public:
   bool IsChecked( int id ) const;
 
   void SetLabel( int id, const wxString &label );
+  wxString GetLabel(int id) const;
 
+  // helpstring
+  virtual void SetHelpString(int id, const wxString& helpString);
+  virtual wxString GetHelpString(int id) const ;
+  
   // accessors
   wxList& GetItems() { return m_items; }