Unicode compilation fixes after wxFFile change

[wxWidgets.git] / src / motif / menuitem.cpp

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index e07a652c5888336c74c344d2ca4b19d0d9da7e22..c0006a04330e73fa8c21fada12023ef20baed479 100644 (file)
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -21,6 +21,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+#include "wx/defs.h"
+

 #include "wx/menu.h"
 #include "wx/menuitem.h"
 #include "wx/utils.h"
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 #include "wx/utils.h"


@@ -60,7 +62,7 @@ static void wxMenuItemDisarmCallback(Widget w, XtPointer clientData, XtPointer p
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 

-    IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)

 
 // ----------------------------------------------------------------------------
 // wxMenuItem
 
 // ----------------------------------------------------------------------------
 // wxMenuItem


@@ -69,23 +71,14 @@ static void wxMenuItemDisarmCallback(Widget w, XtPointer clientData, XtPointer p
 // ctor & dtor
 // -----------
 
 // ctor & dtor
 // -----------
 

-wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
-                       const wxString& strName, const wxString& strHelp,
-                       bool bCheckable,
+wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
+                       int id,
+                       const wxString& strName,
+                       const wxString& strHelp,
+                       wxItemKind kind,

                        wxMenu *pSubMenu)
                        wxMenu *pSubMenu)

+          : wxMenuItemBase(pParentMenu, id, strName, strHelp, kind, pSubMenu)

 {
 {

-    wxASSERT_MSG( pParentMenu != NULL, wxT("menuitem should have a menu") );
-
-    // common init
-    m_parentMenu  = pParentMenu;
-    m_subMenu     = pSubMenu;
-    m_id          = id;
-    m_isEnabled   = TRUE;
-    m_isChecked   = FALSE;
-    m_help        = strHelp;
-    m_isCheckable = bCheckable;
-    m_text        = strName;
-

     // Motif-specific
     m_menuBar      = NULL;
     m_buttonWidget = (WXWidget) NULL;
     // Motif-specific
     m_menuBar      = NULL;
     m_buttonWidget = (WXWidget) NULL;


@@ -157,7 +150,7 @@ void wxMenuItem::Check(bool bDoCheck)
 /* static */
 wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 {
 /* static */
 wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 {

-    return wxStripMenuCodes(m_text);
+    return wxStripMenuCodes(text);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -168,10 +161,10 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
                                 const wxString& name,
                                 const wxString& help,
                                 int id,
                                 const wxString& name,
                                 const wxString& help,

-                                bool isCheckable,
+                                wxItemKind kind,

                                 wxMenu *subMenu)
 {
                                 wxMenu *subMenu)
 {

-    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+    return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------