Fixes for Unicode build.

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

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 59d6e3de901db44e1061ed911266cecc50a61e04..e35a5372adc44cad16ef5d9cdb5b405ec161e2b7 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -6,7 +6,7 @@
 // Created:     25.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     25.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MENUITEM_H_BASE_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MENUITEM_H_BASE_


@@ -38,7 +38,7 @@ class WXDLLEXPORT wxMenuItemBase : public wxObject
 public:
     // creation
     static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL,
 public:
     // creation
     static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL,

-                           int id = wxID_SEPARATOR,
+                           int itemid = wxID_SEPARATOR,

                            const wxString& text = wxEmptyString,
                            const wxString& help = wxEmptyString,
                            wxItemKind kind = wxITEM_NORMAL,
                            const wxString& text = wxEmptyString,
                            const wxString& help = wxEmptyString,
                            wxItemKind kind = wxITEM_NORMAL,


@@ -49,9 +49,10 @@ public:
 
     // the menu we're in
     wxMenu *GetMenu() const { return m_parentMenu; }
 
     // the menu we're in
     wxMenu *GetMenu() const { return m_parentMenu; }

+    void SetMenu(wxMenu* menu) { m_parentMenu = menu; }

 
     // get/set id
 
     // get/set id

-    void SetId(int id) { m_id = id; }
+    void SetId(int itemid) { m_id = itemid; }

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


@@ -70,8 +71,9 @@ 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 = wxITEM_CHECK; }
+    virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; }

     bool IsCheckable() const
         { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; }
 
     bool IsCheckable() const
         { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; }
 


@@ -109,13 +111,13 @@ public:
     const wxString& GetName() const { return GetText(); }
 
     static wxMenuItem *New(wxMenu *parentMenu,
     const wxString& GetName() const { return GetText(); }
 
     static wxMenuItem *New(wxMenu *parentMenu,

-                           int id,
+                           int itemid,

                            const wxString& text,
                            const wxString& help,
                            bool isCheckable,
                            wxMenu *subMenu = (wxMenu *)NULL)
     {
                            const wxString& text,
                            const wxString& help,
                            bool isCheckable,
                            wxMenu *subMenu = (wxMenu *)NULL)
     {

-        return New(parentMenu, id, text, help,
+        return New(parentMenu, itemid, text, help,

                    isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu);
     }
 
                    isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu);
     }
 


@@ -131,7 +133,7 @@ protected:
 
     // this ctor is for the derived classes only, we're never created directly
     wxMenuItemBase(wxMenu *parentMenu = (wxMenu *)NULL,
 
     // this ctor is for the derived classes only, we're never created directly
     wxMenuItemBase(wxMenu *parentMenu = (wxMenu *)NULL,

-                   int id = wxID_SEPARATOR,
+                   int itemid = wxID_SEPARATOR,

                    const wxString& text = wxEmptyString,
                    const wxString& help = wxEmptyString,
                    wxItemKind kind = wxITEM_NORMAL,
                    const wxString& text = wxEmptyString,
                    const wxString& help = wxEmptyString,
                    wxItemKind kind = wxITEM_NORMAL,


@@ -161,10 +163,10 @@ private:
     #include "wx/gtk/menuitem.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/menuitem.h"
     #include "wx/gtk/menuitem.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/menuitem.h"

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

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

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/menuitem.h"

 #endif
 #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY
 
 #endif
 #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY