many wxItemContainer-related changes:

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

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index f7f5cc3c7230c220b8a6070b2525753d73e043c7..bc9d0bee0f254ef2d85b2394dce8cbf72a17aca2 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -12,6 +12,8 @@
 #ifndef _WX_MENUITEM_H_BASE_
 #define _WX_MENUITEM_H_BASE_
 
 #ifndef _WX_MENUITEM_H_BASE_
 #define _WX_MENUITEM_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_MENUS
 
 // ----------------------------------------------------------------------------
 #if wxUSE_MENUS
 
 // ----------------------------------------------------------------------------


@@ -24,9 +26,9 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
 // forward declarations
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxAcceleratorEntry;
-class WXDLLEXPORT wxMenuItem;
-class WXDLLEXPORT wxMenu;
+class WXDLLIMPEXP_FWD_CORE wxAcceleratorEntry;
+class WXDLLIMPEXP_FWD_CORE wxMenuItem;
+class WXDLLIMPEXP_FWD_CORE wxMenu;

 
 // ----------------------------------------------------------------------------
 // wxMenuItem is an item in the menu which may be either a normal item, a sub
 
 // ----------------------------------------------------------------------------
 // wxMenuItem is an item in the menu which may be either a normal item, a sub


@@ -62,7 +64,7 @@ public:
     //     any), i.e. it may contain '&' or '_' or "\t..." and thus is
     //     different from the item's label which only contains the text shown
     //     in the menu
     //     any), i.e. it may contain '&' or '_' or "\t..." and thus is
     //     different from the item's label which only contains the text shown
     //     in the menu

-    virtual void SetText(const wxString& str) { m_text = str; }
+    virtual void SetText(const wxString& str);

     wxString GetLabel() const { return GetLabelFromText(m_text); }
     const wxString& GetText() const { return m_text; }
 
     wxString GetLabel() const { return GetLabelFromText(m_text); }
     const wxString& GetText() const { return m_text; }
 


@@ -71,6 +73,7 @@ public:
 
     // what kind of menu item we are
     wxItemKind GetKind() const { return m_kind; }
 
     // what kind of menu item we are
     wxItemKind GetKind() const { return m_kind; }

+    void SetKind(wxItemKind kind) { m_kind = kind; }

 
     virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; }
     bool IsCheckable() const
 
     virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; }
     bool IsCheckable() const


@@ -81,15 +84,15 @@ public:
     wxMenu *GetSubMenu() const { return m_subMenu; }
 
     // state
     wxMenu *GetSubMenu() const { return m_subMenu; }
 
     // state

-    virtual void Enable(bool enable = TRUE) { m_isEnabled = enable; }
+    virtual void Enable(bool enable = true) { m_isEnabled = enable; }

     virtual bool IsEnabled() const { return m_isEnabled; }
 
     virtual bool IsEnabled() const { return m_isEnabled; }
 

-    virtual void Check(bool check = TRUE) { m_isChecked = check; }
+    virtual void Check(bool check = true) { m_isChecked = check; }

     virtual bool IsChecked() const { return m_isChecked; }
     void Toggle() { Check(!m_isChecked); }
 
     // help string (displayed in the status bar by default)
     virtual bool IsChecked() const { return m_isChecked; }
     void Toggle() { Check(!m_isChecked); }
 
     // help string (displayed in the status bar by default)

-    void SetHelp(const wxString& str) { m_help = str; }
+    void SetHelp(const wxString& str);

     const wxString& GetHelp() const { return m_help; }
 
 #if wxUSE_ACCEL
     const wxString& GetHelp() const { return m_help; }
 
 #if wxUSE_ACCEL


@@ -105,9 +108,11 @@ public:
     virtual void SetAccel(wxAcceleratorEntry *accel);
 #endif // wxUSE_ACCEL
 
     virtual void SetAccel(wxAcceleratorEntry *accel);
 #endif // wxUSE_ACCEL
 

+#if WXWIN_COMPATIBILITY_2_8

     // compatibility only, use new functions in the new code
     // compatibility only, use new functions in the new code

-    void SetName(const wxString& str) { SetText(str); }
-    const wxString& GetName() const { return GetText(); }
+    wxDEPRECATED( void SetName(const wxString& str) );
+    wxDEPRECATED( const wxString& GetName() const );
+#endif // WXWIN_COMPATIBILITY_2_8

 
     static wxMenuItem *New(wxMenu *parentMenu,
                            int itemid,
 
     static wxMenuItem *New(wxMenu *parentMenu,
                            int itemid,


@@ -121,12 +126,12 @@ public:
     }
 
 protected:
     }
 
 protected:

-    int           m_id;             // numeric id of the item >= 0 or -1
+    int           m_id;             // numeric id of the item >= 0 or wxID_ANY or wxID_SEPARATOR

     wxMenu       *m_parentMenu,     // the menu we belong to
                  *m_subMenu;        // our sub menu or NULL
     wxString      m_text,           // label of the item
                   m_help;           // the help string for the item
     wxMenu       *m_parentMenu,     // the menu we belong to
                  *m_subMenu;        // our sub menu or NULL
     wxString      m_text,           // label of the item
                   m_help;           // the help string for the item

-    wxItemKind    m_kind;           // seperator/normal/check/radio item?
+    wxItemKind    m_kind;           // separator/normal/check/radio item?

     bool          m_isChecked;      // is checked?
     bool          m_isEnabled;      // is enabled?
 
     bool          m_isChecked;      // is checked?
     bool          m_isEnabled;      // is enabled?
 


@@ -145,6 +150,13 @@ private:
     wxMenuItemBase& operator=(const wxMenuItemBase& item);
 };
 
     wxMenuItemBase& operator=(const wxMenuItemBase& item);
 };
 

+#if WXWIN_COMPATIBILITY_2_8
+inline void wxMenuItemBase::SetName(const wxString &str)
+    { SetText(str); }
+inline const wxString& wxMenuItemBase::GetName() const
+    { return GetText(); }
+#endif // WXWIN_COMPATIBILITY_2_8
+

 // ----------------------------------------------------------------------------
 // include the real class declaration
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // include the real class declaration
 // ----------------------------------------------------------------------------


@@ -154,12 +166,16 @@ private:
 #else // !wxUSE_BASE_CLASSES_ONLY
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/menuitem.h"
 #else // !wxUSE_BASE_CLASSES_ONLY
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/menuitem.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/menuitem.h"

 #elif defined(__WXMSW__)
     #include "wx/msw/menuitem.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/menuitem.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/menuitem.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/menuitem.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/menuitem.h"
     #include "wx/gtk/menuitem.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/menuitem.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/menuitem.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/menuitem.h"
 #elif defined(__WXCOCOA__)