small optimizations: m_isWindow and m_isCommandEvent flags introduced

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

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index 78445e7432759a3703896aed44d37bc604db73aa..08a63b914eee9406737e442e9c91125e242dbdb0 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -44,20 +44,20 @@ class wxMenuBar: public wxWindow
 DECLARE_DYNAMIC_CLASS(wxMenuBar)
 
 public:
 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;
   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;
   
   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 );
   
   wxString GetLabel( int id ) const;
   void SetLabel( int id, const wxString &label );


@@ -66,8 +66,11 @@ public:
   void SetLabelTop( int pos, const wxString& label );
   wxString GetLabelTop( int pos ) const;
 
   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;
 
   wxList       m_menus;
   GtkWidget   *m_menubar;


@@ -126,6 +129,12 @@ public:
   inline void SetClientData( void* clientData ) { m_clientData = clientData; }
   inline void* GetClientData() const { return m_clientData; }
   
   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;
 // implementation
   
   int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;


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

+  GtkWidget     *m_owner;

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