FixMath fix

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index bac46094725f1599df778ed65f92e97b6401939e..59e62023ad50a5c95ecf6dd7cdd7e7eeeb195897 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -18,12 +18,6 @@
 
 #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"
@@ -43,6 +37,17 @@
 #pragma message enable nosimpint
 #endif
 
+// define symbols that are missing in old versions of Motif.
+#if (XmVersion < 2000)
+#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 +176,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,