wxDC::SetFont can now handle invalid font and doesn't assert anymore (other ports...

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

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index 53de7f53821da81641bf561782eb2618fc83be56..bb464edeaecfe88deecfcbd700c704511f56fb52 100644 (file)
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -21,11 +21,16 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

+#include "wx/defs.h"
+

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

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/CascadeBG.h>
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/CascadeBG.h>


@@ -35,6 +40,9 @@
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>
 #include <Xm/RowColumn.h>
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>
 #include <Xm/RowColumn.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 


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

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)

-#endif  //USE_SHARED_LIBRARY

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


@@ -109,7 +115,7 @@ void wxMenuItem::DeleteSubMenu()
 
 void wxMenuItem::Enable(bool bDoEnable)
 {
 
 void wxMenuItem::Enable(bool bDoEnable)
 {

-    if ( m_isChecked != bDoEnable )
+    if ( m_isEnabled != bDoEnable )

     {
         if ( !IsSubMenu() )
         {
     {
         if ( !IsSubMenu() )
         {


@@ -150,12 +156,12 @@ void wxMenuItem::Check(bool bDoCheck)
     }
 }
 
     }
 }
 

-wxString wxMenuItem::GetLabel() const
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)

 {
 {

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

 }
 
 }
 

-

 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 // ----------------------------------------------------------------------------