X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dac5a9c997a9495fbad0e7663a67858ac6562413..e3f2384e48ab8d8532e364b3762b0b3ac689e650:/src/motif/checkbox.cpp

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index bac4609472..681d9482f0 100644
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -16,16 +16,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XmNtoggleMode 0
-#define XmTOGGLE_INDETERMINATE 1
-#define XmTOGGLE_BOOLEAN 2
-#define XmUNSET 3
-#define XmSET 4
-#define XmINDETERMINATE 5
-#endif
-
 #include "wx/defs.h"
 
 #include "wx/checkbox.h"
@@ -43,6 +33,18 @@
 #pragma message enable nosimpint
 #endif
 
+// define symbols that are missing in old versions of Motif.
+#if defined(__VMS) || (XmVersion < 2000)
+#define XtDisplay XTDISPLAY
+#define XmNtoggleMode 0
+#define XmTOGGLE_INDETERMINATE 1
+#define XmTOGGLE_BOOLEAN 2
+#define XmUNSET 3
+#define XmSET 4
+#define XmINDETERMINATE 5
+#endif
+
+
 #include "wx/motif/private.h"
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
@@ -171,6 +173,7 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
     case wxCHK_UNCHECKED: value = XmUNSET; break;
     case wxCHK_CHECKED: value = XmSET; break;
     case wxCHK_UNDETERMINED: value = XmINDETERMINATE; break;
+    default: wxASSERT(0); return;
     }
 
     XtVaSetValues( (Widget) m_mainWidget,