Cured last focus bug (I hope); some wxMotif mods

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

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index a4656258ede72269212ffe22c07a0aac8639f28a..08a63b914eee9406737e442e9c91125e242dbdb0 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -44,23 +44,33 @@ class wxMenuBar: public wxWindow
 DECLARE_DYNAMIC_CLASS(wxMenuBar)
 
 public:
+  wxMenuBar( long style );
   wxMenuBar();
   void Append( wxMenu *menu, const wxString &title );
 
   int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
   wxMenuItem* FindMenuItemById( int id ) const;
-  inline wxMenuItem* FindItemForId( int id ) const
-    { return FindMenuItemById( id ); }
+  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;
-  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(); }
+  virtual void SetHelpString( int id, const wxString& helpString );
+  virtual wxString GetHelpString( int id ) const;
+  
+  inline int GetMenuCount() const { return m_menus.Number(); }
+  inline wxMenu *GetMenu( int n ) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
 
   wxList       m_menus;
   GtkWidget   *m_menubar;
@@ -102,7 +112,7 @@ public:
   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);
@@ -119,6 +129,12 @@ public:
   inline void SetClientData( void* clientData ) { m_clientData = clientData; }
   inline void* GetClientData() const { return m_clientData; }
   
+  // Updates the UI for a menu and all submenus recursively.
+  // source is the object that has the update event handlers
+  // defined for it. If NULL, the menu or associated window
+  // will be used.
+  void UpdateUI(wxEvtHandler* source = (wxEvtHandler*) NULL);
+
 // implementation
   
   int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
@@ -133,6 +149,7 @@ public:
   void          *m_clientData;
 
   GtkWidget     *m_menu;  // GtkMenu
+  GtkWidget     *m_owner;
 };
 
 #endif // __GTKMENUH__