Small optical changes for MSW

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

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 446498063b54d2f6b26a2a3a07a07e062a13712d..0575a81dab9f52b65c7860f6aae69841cbfaac9d 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -28,63 +28,68 @@
 //-----------------------------------------------------------------------------
 
 class wxMenuItem;
 //-----------------------------------------------------------------------------
 
 class wxMenuItem;

-

 class wxMenu;
 
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------
 
 class wxMenu;
 
 //-----------------------------------------------------------------------------
 // wxMenuItem
 //-----------------------------------------------------------------------------
 

-class wxMenuItem: public wxObject
+class wxMenuItem : public wxObject

 {
 DECLARE_DYNAMIC_CLASS(wxMenuItem)
 
 public:
 {
 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 = name
-  void SetName(const wxString& str);
-  void SetText(const wxString& str) { SetName(str); } // compatibility
-  const wxString& GetName() const { return m_text; }
-  const wxString& GetText() const { return GetName(); }
-
-    // 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; }
-
-  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
+    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 = name
+    void SetName(const wxString& str);
+    void SetText(const wxString& str) { SetName(str); } // compatibility
+    const wxString& GetName() const { return m_text; }
+    const wxString& GetText() const { return GetName(); }
+
+        // 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; }
+    
+    wxString GetHotKey() const { return m_hotKey; }
+
+    void SetCheckedFlag(bool checked) { m_isChecked = checked; }
+    bool GetCheckedFlag() const { return m_isChecked; }
+
+private:
+    int           m_id;
+    wxString      m_text;
+    wxString      m_hotKey;
+    bool          m_isCheckMenu;
+    bool          m_isChecked;
+    bool          m_isEnabled;
+    wxMenu       *m_subMenu;
+    wxString      m_helpStr;
+
+    GtkWidget    *m_menuItem;  // GtkMenuItem

 };
 
 
 };