aui docking works well on systems with solid window dragging turned off

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 04531704eee9215de01e5e1b5d5df092c916ea99..585c467600427ab9b8ebef615139340c1ef19e9c 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -20,8 +20,11 @@
 #endif
 
 #include "wx/choice.h"
 #endif
 
 #include "wx/choice.h"

-#include "wx/utils.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/arrstr.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -192,7 +195,7 @@ int wxChoice::DoInsert(const wxString& item, unsigned int pos)
 #ifndef XmNpositionIndex
     wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
 #endif
 #ifndef XmNpositionIndex
     wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
 #endif

-    Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
+    Widget w = XtVaCreateManagedWidget (GetLabelText(item),

 #if wxUSE_GADGETS
         xmPushButtonGadgetClass, (Widget) m_menuWidget,
 #else
 #if wxUSE_GADGETS
         xmPushButtonGadgetClass, (Widget) m_menuWidget,
 #else