custom icons for DnD

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

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index f20657838abab6bc143e60110ebb90c36f24531b..446498063b54d2f6b26a2a3a07a07e062a13712d 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -48,9 +48,11 @@ public:
   int  GetId() const { return m_id; }
   bool IsSeparator() const { return m_id == ID_SEPARATOR; }
 
   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; }
+    // 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; }
 
     // what kind of menu item we are
   void SetCheckable(bool checkable) { m_isCheckMenu = checkable; }


@@ -60,7 +62,7 @@ public:
   bool IsSubMenu() const { return m_subMenu != NULL; }
 
     // state
   bool IsSubMenu() const { return m_subMenu != NULL; }
 
     // state

-  void Enable( bool enable = TRUE ); 
+  void Enable( bool enable = TRUE );

   bool IsEnabled() const { return m_isEnabled; }
   void Check( bool check = TRUE );
   bool IsChecked() const;
   bool IsEnabled() const { return m_isEnabled; }
   void Check( bool check = TRUE );
   bool IsChecked() const;


@@ -70,10 +72,10 @@ public:
   const wxString& GetHelp() const { return m_helpStr; }
 
   // implementation
   const wxString& GetHelp() const { return m_helpStr; }
 
   // implementation

+  

   void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
   GtkWidget *GetMenuItem() const { return m_menuItem; }
 
   void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
   GtkWidget *GetMenuItem() const { return m_menuItem; }
 

-private:

   int           m_id;
   wxString      m_text;
   bool          m_isCheckMenu;
   int           m_id;
   wxString      m_text;
   bool          m_isCheckMenu;


@@ -86,5 +88,5 @@ private:
 };
 
 
 };
 
 

-#endif  
+#endif

         //__GTKMENUITEMH__
         //__GTKMENUITEMH__