Added install scripts in missing places

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 38da6ec98fc5fa6cec8f0818412d4162e03ff7ac..9896ab085e281314164ffbd2daa49ebebeafafb6 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -2,9 +2,8 @@
 // Name:        menu.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        menu.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -20,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/window.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/window.h"

+#include "wx/menuitem.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -49,13 +49,17 @@ public:
 
   int FindMenuItem( const wxString &menuString, const wxString &itemString ) const;
   wxMenuItem* FindMenuItemById( int id ) const;
 
   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(); }
 
 
   int     GetMenuCount() const { return m_menus.Number(); }
   wxMenu *GetMenu(int n) const { return (wxMenu *)m_menus.Nth(n)->Data(); }
 

-  bool IsChecked( int id ) const;
-  bool IsEnabled( int id ) const;
-

   wxList       m_menus;
   GtkWidget   *m_menubar;
 };
   wxList       m_menus;
   GtkWidget   *m_menubar;
 };


@@ -64,64 +68,18 @@ public:
 // wxMenu
 //-----------------------------------------------------------------------------
 
 // 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) { m_isEnabled = enable; }
-  bool IsEnabled() const { return m_isEnabled; }
-  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; }
-
-  // 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)
 
 public:
   // construction
 class wxMenu: public wxEvtHandler
 {
 DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:
   // construction

-  wxMenu( const wxString &title = "" );
+  wxMenu( const wxString& title = wxEmptyString, const wxFunction func = (wxFunction) NULL );

 
   // operations
 
   // operations

+    // title
+  void SetTitle(const wxString& label);
+  const wxString GetTitle() const;

     // menu creation
   void AppendSeparator();
   void Append(int id, const wxString &item,
     // menu creation
   void AppendSeparator();
   void Append(int id, const wxString &item,


@@ -132,7 +90,8 @@ public:
 
     // find item by name/id
   int FindItem( const wxString itemString ) const;
 
     // 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 );
 
     // get/set item's state
   void Enable( int id, bool enable );


@@ -141,20 +100,37 @@ public:
   bool IsChecked( int id ) const;
 
   void SetLabel( int id, const wxString &label );
   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; }
 
   // accessors
   wxList& GetItems() { return m_items; }
 

-public:
+  inline void Callback(const wxFunction func) { m_callback = func; }
+  
+  inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
+  inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
+  
+  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();
 
   int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
   void SetInvokingWindow( wxWindow *win );
   wxWindow *GetInvokingWindow();
 

-  wxString    m_title;
-  wxList      m_items;
-  wxWindow   *m_invokingWindow;
+  wxString       m_title;
+  wxList         m_items;
+  wxWindow      *m_invokingWindow;
+  wxFunction     m_callback;
+  wxEvtHandler  *m_eventHandler;
+  void          *m_clientData;

 
 

-  GtkWidget  *m_menu;  // GtkMenu
+  GtkWidget     *m_menu;  // GtkMenu

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