Makefile tweaks

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 7060ea2dd0ce920ec7e702dac05472c1cb934ca0..a4656258ede72269212ffe22c07a0aac8639f28a 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -19,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/window.h"
+#include "wx/menuitem.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -48,6 +49,8 @@ public:
 
   int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
   wxMenuItem* FindMenuItemById( int id ) const;
+  inline wxMenuItem* FindItemForId( int id ) const
+    { return FindMenuItemById( id ); }
   
   void Check( int id, bool check );
   bool Checked( int id ) const;
@@ -67,56 +70,6 @@ public:
 // wxMenu
 //-----------------------------------------------------------------------------
 
-class wxMenuItem: public wxObject
-{
-DECLARE_DYNAMIC_CLASS(wxMenuItem)
-
-public:
-  wxMenuItem();
-
-  // accessors
-    // id
-  void SetId(int id) { m_id = id; }
-  int  GetId() const { return m_id; }
-  bool IsSeparator() const { return m_id == ID_SEPARATOR; }
-
-    // the item's text
-  void SetText(const wxString& str);
-  const wxString& GetText() const { return m_text; }
-
-    // what kind of menu item we are
-  void SetCheckable(bool checkable) { m_isCheckMenu = checkable; }
-  bool IsCheckable() const { return m_isCheckMenu; }
-  void SetSubMenu(wxMenu *menu) { m_subMenu = menu; }
-  wxMenu *GetSubMenu() const { return m_subMenu; }
-  bool IsSubMenu() const { return m_subMenu != NULL; }
-
-    // state
-  void Enable( bool enable = TRUE ); 
-  bool IsEnabled() const { return m_isEnabled; }
-  void Check( bool check = TRUE );
-  bool IsChecked() const;
-
-    // help string (displayed in the status bar by default)
-  void SetHelp(const wxString& str) { m_helpStr = str; }
-  const wxString& GetHelp() const { return m_helpStr; }
-
-  // implementation
-  void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
-  GtkWidget *GetMenuItem() const { return m_menuItem; }
-
-private:
-  int           m_id;
-  wxString      m_text;
-  bool          m_isCheckMenu;
-  bool          m_isChecked;
-  bool          m_isEnabled;
-  wxMenu       *m_subMenu;
-  wxString      m_helpStr;
-
-  GtkWidget    *m_menuItem;  // GtkMenuItem
-};
-
 class wxMenu: public wxEvtHandler
 {
 DECLARE_DYNAMIC_CLASS(wxMenu)
@@ -163,7 +116,11 @@ public:
   inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
   inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
   
-public:
+  inline void SetClientData( void* clientData ) { m_clientData = clientData; }
+  inline void* GetClientData() const { return m_clientData; }
+  
+// implementation
+  
   int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
   void SetInvokingWindow( wxWindow *win );
   wxWindow *GetInvokingWindow();
@@ -173,6 +130,7 @@ public:
   wxWindow      *m_invokingWindow;
   wxFunction     m_callback;
   wxEvtHandler  *m_eventHandler;
+  void          *m_clientData;
 
   GtkWidget     *m_menu;  // GtkMenu
 };