X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da494b405d0826b343ea6d249bbac27061e11d3e..926ce9e3ac32e1a33cc43420f76876fac8868436:/src/motif/checkbox.cpp?ds=sidebyside diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp index 8d89b52531..9a274cc63a 100644 --- a/src/motif/checkbox.cpp +++ b/src/motif/checkbox.cpp @@ -9,9 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "checkbox.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #ifdef __VMS #define XtDisplay XTDISPLAY @@ -34,6 +33,16 @@ #pragma message enable nosimpint #endif +#include "wx/motif/private.h" + +// define symbols that are missing in old versions of Motif. +#if wxCHECK_MOTIF_VERSION( 2, 0 ) + #define wxHAS_3STATE 1 +#else + #define wxHAS_3STATE 0 +#endif + + #include "wx/motif/private.h" void wxCheckBoxCallback (Widget w, XtPointer clientData, @@ -50,7 +59,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, { if( !wxControl::CreateControl( parent, id, pos, size, style, validator, name ) ) - return FALSE; + return false; wxString label1(wxStripMenuCodes(label)); wxXmString text( label1 ); @@ -59,40 +68,55 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle", xmToggleButtonWidgetClass, parentWidget, - wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)), + wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)), XmNlabelString, text(), + XmNrecomputeSize, False, + // XmNindicatorOn, XmINDICATOR_CHECK_BOX, + // XmNfillOnSelect, False, +#if wxHAS_3STATE + XmNtoggleMode, Is3State() ? XmTOGGLE_INDETERMINATE : XmTOGGLE_BOOLEAN, +#endif NULL); XtAddCallback( (Widget)m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback, (XtPointer)this ); - XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE); + XmToggleButtonSetState ((Widget) m_mainWidget, False, True); - SetCanAddEventHandler(TRUE); AttachWidget( parent, m_mainWidget, (WXWidget)NULL, pos.x, pos.y, size.x, size.y ); ChangeBackgroundColour(); - return TRUE; + return true; } 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 { - return (XmToggleButtonGetState ((Widget) m_mainWidget) != 0); + return (Get3StateValue() != 0); } 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, @@ -103,10 +127,18 @@ void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData, 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() @@ -121,7 +153,7 @@ void wxCheckBox::ChangeBackgroundColour() XmNforeground, g_itemColors[wxFORE_INDEX].pixel, NULL); - int selectPixel = wxBLACK->AllocColour(wxGetDisplay()); + int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget)); // Better to have the checkbox selection in black, or it's // hard to determine what state it is in. @@ -130,6 +162,55 @@ void wxCheckBox::ChangeBackgroundColour() NULL); } +void wxCheckBox::DoSet3StateValue(wxCheckBoxState state) +{ + m_inSetValue = true; + +#if wxHAS_3STATE + 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 ); +#else + XmToggleButtonSetState ((Widget) m_mainWidget, + state == wxCHK_CHECKED, True); +#endif + + m_inSetValue = false; +} + +wxCheckBoxState wxCheckBox::DoGet3StateValue() const +{ +#if wxHAS_3STATE + 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; +#else + return wxCheckBoxState(XmToggleButtonGetState ((Widget) m_mainWidget)); +#endif +} + /////////////////////////////////////////////////////////////////////////////// // wxToggleButton ///////////////////////////////////////////////////////////////////////////////