Added wxUSE_NUMBERDLG to setup.h; added some files to VC++ project files;

[wxWidgets.git] / src / motif / xmcombo / xmcombo.c

diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c
index f612df4e95487ab9ec4ea5541532e3535b936d35..189d72e321dd637c1de03bafc814e1ef91503623 100644 (file)
--- a/src/motif/xmcombo/xmcombo.c
+++ b/src/motif/xmcombo/xmcombo.c
@@ -91,6 +91,9 @@
  * Cambridge, MA 02139, USA.
  *
  */
  * Cambridge, MA 02139, USA.
  *
  */

+#ifdef __VMS
+#include <wx/vms_x_fix.h>
+#endif

 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>


@@ -116,8 +119,10 @@
 #include <stdio.h>
 
 /* --- Systemspezifische Definitionen */
 #include <stdio.h>
 
 /* --- Systemspezifische Definitionen */

-#ifdef VMS
+#if defined(VMS)

 #define strcasecmp(s1, s2) strcmp(s1, s2)
 #define strcasecmp(s1, s2) strcmp(s1, s2)

+#elif defined(__EMX__)
+#define strcasecmp stricmp

 #endif
 
 /* --- sonstiger Quark */
 #endif
 
 /* --- sonstiger Quark */


@@ -448,7 +453,7 @@ XmComboBoxClassRec xmComboBoxClassRec = {
     /* accept_focus                */  NULL,
     /* version                     */  XtVersion,
     /* callback_private            */  NULL,
     /* accept_focus                */  NULL,
     /* version                     */  XtVersion,
     /* callback_private            */  NULL,

-    /* tm_table                            */  NULL,
+    /* tm_table                            */  XtInheritTranslations, /* Changed from NULL: Bug #406153 */

     /* query_geometry              */  (XtGeometryHandler) QueryGeometry,
     /* display_accelerator         */  XtInheritDisplayAccelerator,
     /* extension                   */  NULL
     /* query_geometry              */  (XtGeometryHandler) QueryGeometry,
     /* display_accelerator         */  XtInheritDisplayAccelerator,
     /* extension                   */  NULL