Flicker war won.

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 50ed50f32b814b44acd751cac61bd4daad320c93..9896ab085e281314164ffbd2daa49ebebeafafb6 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -2,10 +2,9 @@
 // Name:        menu.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -20,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/window.h"
+#include "wx/menuitem.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -41,88 +41,96 @@ class wxMenu;
 
 class wxMenuBar: public wxWindow
 {
-  DECLARE_DYNAMIC_CLASS(wxMenuBar)
-
-  public:
-
-    wxMenuBar(void);
-    void Append( wxMenu *menu, const wxString &title );
-    int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
-    wxMenuItem* FindMenuItemById( int id ) const;
-    bool IsChecked( int id ) const;
-    bool IsEnabled( int id ) const;
-    
-    wxList       m_menus;
-    GtkWidget   *m_menubar;
+DECLARE_DYNAMIC_CLASS(wxMenuBar)
+
+public:
+  wxMenuBar();
+  void Append( wxMenu *menu, const wxString &title );
+
+  int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
+  wxMenuItem* FindMenuItemById( 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); };
+
+  int     GetMenuCount() const { return m_menus.Number(); }
+  wxMenu *GetMenu(int n) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
+
+  wxList       m_menus;
+  GtkWidget   *m_menubar;
 };
 
 //-----------------------------------------------------------------------------
 // wxMenu
 //-----------------------------------------------------------------------------
 
-class wxMenuItem: public wxObject
+class wxMenu: public wxEvtHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxMenuItem)
+DECLARE_DYNAMIC_CLASS(wxMenu)
+
+public:
+  // construction
+  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,
+              const wxString &helpStr = "", bool checkable = FALSE);
+  void Append(int id, const wxString &item,
+              wxMenu *subMenu, const wxString &helpStr = "" );
+  void Break() {};
+
+    // find item by name/id
+  int FindItem( const wxString itemString ) 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 );
+  bool IsEnabled( int id ) const;
+  void Check( int id, bool check );
+  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; }
 
-  public:
+  inline void Callback(const wxFunction func) { m_callback = func; }
   
-    wxMenuItem(void);
+  inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
+  inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
   
-    int           m_id;
-    wxString      m_text;
-    bool          m_isCheckMenu;
-    bool          m_checked;
-    bool          m_isSubMenu;
-    bool          m_isEnabled;
-    wxMenu       *m_subMenu;
-    wxString      m_helpStr;
-    
-    GtkWidget    *m_menuItem;  // GtkMenuItem
-    
-    bool IsCheckable()         const { return m_isCheckMenu; }
-    bool IsSeparator()         const { return m_id == ID_SEPARATOR;  }
-    bool IsEnabled()           const { return m_isEnabled;  }
-    int  GetId()               const { return m_id; }
-    const wxString& GetHelp()  const { return m_helpStr; }
-    wxMenu *GetSubMenu()       const { return m_subMenu; }
-    
-    void Check( bool check );
-    bool IsChecked() const;
-    void Enable( bool enable );
-};
-
-class wxMenu: public wxEvtHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxMenu)
-
-  public:
-
-    wxMenu( const wxString &title = "" );
-    void AppendSeparator(void);
-    void Append( int id, const wxString &item, 
-      const wxString &helpStr = "", bool checkable = FALSE );
-    void Append( int id, const wxString &item,
-      wxMenu *subMenu, const wxString &helpStr = "" );
-    int FindItem( const wxString itemString ) const;
-    wxMenuItem* FindItemForId( int id ) const;
-    void Break(void) {};
-    void Check(int id, bool Flag);
-    void Enable( int id, bool enable );
-    bool Enabled( int id ) const;
-    void SetLabel( int id, const wxString &label );
-
-  public:
-      
-    int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
-    void SetInvokingWindow( wxWindow *win );
-    wxWindow *GetInvokingWindow(void);
-
-    wxString    m_title;
-    wxList      m_items;
-    wxWindow   *m_invokingWindow;
-    
-    GtkWidget  *m_menu;  // GtkMenu
-      
+  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();
+
+  wxString       m_title;
+  wxList         m_items;
+  wxWindow      *m_invokingWindow;
+  wxFunction     m_callback;
+  wxEvtHandler  *m_eventHandler;
+  void          *m_clientData;
+
+  GtkWidget     *m_menu;  // GtkMenu
 };
 
 #endif // __GTKMENUH__