pch-less compilation fix for r55285

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

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 75b2dcff3d7a44c40b88f52f968d3ce817e1e859..1f98a5d1ee65fdc4b2d4dfd07f28d40ac380f330 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -35,7 +35,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu;
 // menu or a separator
 // ----------------------------------------------------------------------------
 
 // menu or a separator
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMenuItemBase : public wxObject
+class WXDLLIMPEXP_CORE wxMenuItemBase : public wxObject

 {
 public:
     // creation
 {
 public:
     // creation


@@ -56,7 +56,6 @@ public:
     // get/set id
     void SetId(int itemid) { m_id = itemid; }
     int  GetId() const { return m_id; }
     // get/set id
     void SetId(int itemid) { m_id = itemid; }
     int  GetId() const { return m_id; }

-    bool IsSeparator() const { return m_id == wxID_SEPARATOR; }

 
     // the item's text (or name)
     //
 
     // the item's text (or name)
     //


@@ -81,6 +80,7 @@ public:
     // what kind of menu item we are
     wxItemKind GetKind() const { return m_kind; }
     void SetKind(wxItemKind kind) { m_kind = kind; }
     // what kind of menu item we are
     wxItemKind GetKind() const { return m_kind; }
     void SetKind(wxItemKind kind) { m_kind = kind; }

+    bool IsSeparator() const { return m_kind == wxITEM_SEPARATOR; }

 
     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


@@ -145,7 +145,7 @@ public:
     }
 
 protected:
     }
 
 protected:

-    int           m_id;             // numeric id of the item >= 0 or wxID_ANY or wxID_SEPARATOR
+    wxWindowIDRef 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
     wxMenu       *m_parentMenu,     // the menu we belong to
                  *m_subMenu;        // our sub menu or NULL
     wxString      m_text,           // label of the item


@@ -175,7 +175,7 @@ inline void wxMenuItemBase::SetName(const wxString &str)
 inline wxString wxMenuItemBase::GetName() const
     { return GetItemLabel(); }
 inline wxString wxMenuItemBase::GetLabel() const
 inline wxString wxMenuItemBase::GetName() const
     { return GetItemLabel(); }
 inline wxString wxMenuItemBase::GetLabel() const

-    { return GetLabelFromText(m_text); }
+    { return GetLabelText(m_text); }

 inline const wxString& wxMenuItemBase::GetText() const { return m_text; }
 inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text); }
 #endif // WXWIN_COMPATIBILITY_2_8
 inline const wxString& wxMenuItemBase::GetText() const { return m_text; }
 inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text); }
 #endif // WXWIN_COMPATIBILITY_2_8


@@ -200,7 +200,7 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text);
 #elif defined(__WXGTK__)
     #include "wx/gtk1/menuitem.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/menuitem.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/menuitem.h"
+    #include "wx/osx/menuitem.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menuitem.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menuitem.h"
 #elif defined(__WXPM__)