X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcd055ae108a30299fa278f3fe774f52414eb3df..662ba874795045558374a61c85a7e3c2de5bbdbb:/src/motif/checkbox.cpp

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index f6226acfd4..6a68b1009b 100644
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -1,24 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.cpp
+// Name:        src/motif/checkbox.cpp
 // Purpose:     wxCheckBox
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "checkbox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/checkbox.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
 #endif
 
-#include "wx/checkbox.h"
-#include "wx/utils.h"
+#include "wx/tglbtn.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -33,12 +33,18 @@
 
 #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,
                          XtPointer ptr);
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
-
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
                         const wxPoint& pos,
@@ -46,112 +52,66 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
                         const wxValidator& validator,
                         const wxString& name)
 {
-    SetName(name);
-    SetValidator(validator);
-    m_windowStyle = style;
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    m_font = parent->GetFont();
-
-    if (parent) parent->AddChild(this);
+    if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
+                                   name ) )
+        return false;
+    PreCreation();
 
-    if ( id == -1 )
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+    wxXmString text( GetLabelText(label) );
 
-#if 0  // gcc 2.95 doesn't like this apparently    
-    char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-    XmString text = XmStringCreateSimple (label1);
-#endif
-    wxString label1(wxStripMenuCodes(label));
-
-    wxXmString text( label1 );
-    
     Widget parentWidget = (Widget) parent->GetClientWidget();
-    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
         xmToggleButtonWidgetClass, parentWidget,
-        XmNfontList, fontList,
+        wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)),
         XmNlabelString, text(),
-        NULL);
-#if 0    
-    XmStringFree (text);
+        XmNrecomputeSize, False,
+        // XmNindicatorOn, XmINDICATOR_CHECK_BOX,
+        // XmNfillOnSelect, False,
+#if wxHAS_3STATE
+        XmNtoggleMode, Is3State() ? XmTOGGLE_INDETERMINATE : XmTOGGLE_BOOLEAN,
 #endif
-    
-    XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
-        (XtPointer) this);
+        NULL);
 
-    XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
+    XtAddCallback( (Widget)m_mainWidget,
+                   XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
+                   (XtPointer)this );
 
-    SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    XmToggleButtonSetState ((Widget) m_mainWidget, False, True);
 
-    ChangeBackgroundColour();
-    return TRUE;
+    PostCreation();
+    AttachWidget( parent, m_mainWidget, (WXWidget)NULL,
+                  pos.x, pos.y, size.x, size.y );
+
+    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);
-}
-
-// Bitmap checkbox
-bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *WXUNUSED(label),
-                              const wxPoint& WXUNUSED(pos),
-                              const wxSize& WXUNUSED(size), long style,
-                              const wxValidator& validator,
-                              const wxString& name)
-{
-    SetName(name);
-    SetValidator(validator);
-    m_windowStyle = style;
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
-
-    // TODO: Create the bitmap checkbox
+    int state = event.GetInt();
+    wxCHECK_RET( (state == wxCHK_UNCHECKED) || (state == wxCHK_CHECKED)
+        || (state == wxCHK_UNDETERMINED),
+        wxT("event.GetInt() returned an invalid checkbox state") );
 
-    return FALSE;
-}
-
-void wxBitmapCheckBox::SetLabel(const wxBitmap& WXUNUSED(bitmap))
-{
-    // TODO
-}
-
-void wxBitmapCheckBox::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(sizeFlags))
-{
-    // TODO
-}
-
-void wxBitmapCheckBox::SetValue(bool WXUNUSED(val))
-{
-    // TODO
-}
-
-bool wxBitmapCheckBox::GetValue() const
-{
-    // TODOD
-    return FALSE;
+    Set3StateValue((wxCheckBoxState) state);
+    ProcessCommand(event);
 }
 
 void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
@@ -162,21 +122,27 @@ void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
     if (item->InSetValue())
         return;
 
-    wxCommandEvent event (wxEVT_COMMAND_CHECKBOX_CLICKED, item->GetId());
-    event.SetInt((int) item->GetValue ());
-    event.SetEventObject(item);
-    item->ProcessCommand (event);
-}
+    wxCheckBoxState state = item->Get3StateValue();
 
-void wxCheckBox::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
+    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()
 {
+    if (!m_backgroundColour.IsOk())
+        return;
+
     wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour,
-        (wxColour*) NULL);
+        NULL);
 
     XtVaSetValues ((Widget) m_mainWidget,
         XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
@@ -185,17 +151,104 @@ void wxCheckBox::ChangeBackgroundColour()
         XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
         NULL);
 
-    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+    wxColour colour = *wxBLACK;
+    WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));
 
     // Better to have the checkbox selection in black, or it's
     // hard to determine what state it is in.
     XtVaSetValues ((Widget) m_mainWidget,
-   //        XmNselectColor, g_itemColors[wxSELE_INDEX].pixel,
            XmNselectColor, selectPixel,
-        NULL);
+           NULL);
 }
 
-void wxCheckBox::ChangeForegroundColour()
+void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 {
-    wxWindow::ChangeForegroundColour();
+    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
+///////////////////////////////////////////////////////////////////////////////
+
+#if wxUSE_TOGGLEBTN
+
+wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
+
+bool wxToggleButton::Create( wxWindow* parent, wxWindowID id,
+                             const wxString& label,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             const wxValidator& val,
+                             const wxString &name )
+{
+    if( !wxCheckBox::Create( parent, id, label, pos, size, style, val, name ) )
+        return false;
+
+    XtVaSetValues( (Widget)m_mainWidget,
+                   XmNindicatorSize, 0,
+#if XmVersion >= 2000
+                   XmNindicatorOn, XmINDICATOR_NONE,
+#else
+                   XmNindicatorOn, False,
+#endif
+                   XmNfillOnSelect, False,
+                   XmNshadowThickness, 2,
+                   XmNalignment, XmALIGNMENT_CENTER,
+                   XmNmarginLeft, 0,
+                   XmNmarginRight, 0,
+                   NULL );
+
+    // set it again, because the XtVaSetValue above resets it
+    if( size.x != -1 || size.y != -1 )
+        SetSize( size );
+
+    return true;
 }
+
+#endif // wxUSE_TOGGLEBTN