harmless warning fixes for WinCE (mostly unused parameters)

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index dea61e497e0c1648a4df16689523c1b071d9ab06..c2a317b6456b13ada8b14cf1e1c0fad25ed31cca 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -37,6 +37,17 @@
 #pragma message enable nosimpint
 #endif
 
 #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,
 #include "wx/motif/private.h"
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,


@@ -53,7 +64,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 {
     if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
                                    name ) )
 {
     if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
                                    name ) )

-        return FALSE;
+        return false;

 
     wxString label1(wxStripMenuCodes(label));
     wxXmString text( label1 );
 
     wxString label1(wxStripMenuCodes(label));
     wxXmString text( label1 );


@@ -65,37 +76,50 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)),
         XmNlabelString, text(),
         XmNrecomputeSize, False,
         wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)),
         XmNlabelString, text(),
         XmNrecomputeSize, False,

+        // XmNindicatorOn, XmINDICATOR_CHECK_BOX,
+        // XmNfillOnSelect, False,
+        XmNtoggleMode, Is3State() ? XmTOGGLE_INDETERMINATE : XmTOGGLE_BOOLEAN,

         NULL);
     
     XtAddCallback( (Widget)m_mainWidget,
                    XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
                    (XtPointer)this );
 
         NULL);
     
     XtAddCallback( (Widget)m_mainWidget,
                    XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
                    (XtPointer)this );
 

-    XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
+    XmToggleButtonSetState ((Widget) m_mainWidget, False, True);

 
     AttachWidget( parent, m_mainWidget, (WXWidget)NULL,
                   pos.x, pos.y, size.x, size.y );
 
     ChangeBackgroundColour();
 
     AttachWidget( parent, m_mainWidget, (WXWidget)NULL,
                   pos.x, pos.y, size.x, size.y );
 
     ChangeBackgroundColour();

-    return TRUE;
+    return true;

 }
 
 void wxCheckBox::SetValue(bool val)
 {
 }
 
 void wxCheckBox::SetValue(bool val)
 {

-    m_inSetValue = TRUE;
-    XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) val, TRUE);
-    m_inSetValue = FALSE;
+    if (val)
+    {
+        Set3StateValue(wxCHK_CHECKED);
+    }
+    else
+    {
+        Set3StateValue(wxCHK_UNCHECKED);
+    }

 }
 
 bool wxCheckBox::GetValue() const
 {
 }
 
 bool wxCheckBox::GetValue() const
 {

-    return (XmToggleButtonGetState ((Widget) m_mainWidget) != 0);
+    return (Get3StateValue() != 0);

 }
 
 void wxCheckBox::Command (wxCommandEvent & event)
 {
 }
 
 void wxCheckBox::Command (wxCommandEvent & event)
 {

-    SetValue ((event.GetInt() != 0));
-    ProcessCommand (event);
+    int state = event.GetInt();
+    wxCHECK_RET( (state == wxCHK_UNCHECKED) || (state == wxCHK_CHECKED)
+        || (state == wxCHK_UNDETERMINED),
+        wxT("event.GetInt() returned an invalid checkbox state") );
+
+    Set3StateValue((wxCheckBoxState) state);
+    ProcessCommand(event);

 }
 
 void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
 }
 
 void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData,


@@ -106,10 +130,18 @@ void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
     if (item->InSetValue())
         return;
 
     if (item->InSetValue())
         return;
 

-    wxCommandEvent event (item->m_evtType, item->GetId());
-    event.SetInt((int) item->GetValue ());
-    event.SetEventObject(item);
-    item->ProcessCommand (event);
+    wxCheckBoxState state = item->Get3StateValue();
+
+    if( !item->Is3rdStateAllowedForUser() && state == wxCHK_UNDETERMINED )
+    {
+        state = wxCHK_UNCHECKED;
+        item->Set3StateValue( state );
+    }
+
+    wxCommandEvent event( item->m_evtType, item->GetId() );
+    event.SetInt( (int)state );
+    event.SetEventObject( item );
+    item->ProcessCommand( event );

 }
 
 void wxCheckBox::ChangeBackgroundColour()
 }
 
 void wxCheckBox::ChangeBackgroundColour()


@@ -133,6 +165,46 @@ void wxCheckBox::ChangeBackgroundColour()
         NULL);
 }
 
         NULL);
 }
 

+void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
+{
+    m_inSetValue = true;
+
+    unsigned char value;
+
+    switch (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,
+                   XmNset, value,
+                   NULL );
+
+    m_inSetValue = false;
+}
+
+wxCheckBoxState wxCheckBox::DoGet3StateValue() const
+{
+    unsigned char value = 0;
+
+    XtVaGetValues( (Widget) m_mainWidget,
+                   XmNset, &value,
+                   NULL );
+
+    switch (value)
+    {
+    case XmUNSET: return wxCHK_UNCHECKED;
+    case XmSET: return wxCHK_CHECKED;
+    case XmINDETERMINATE: return wxCHK_UNDETERMINED;
+    }
+
+    // impossible...
+    return wxCHK_UNDETERMINED;
+}
+

 ///////////////////////////////////////////////////////////////////////////////
 // wxToggleButton
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // wxToggleButton
 ///////////////////////////////////////////////////////////////////////////////