X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b5f3fe655deeb91d5d3abe8fad30c4a1cae63dc..3e4efd7cb97cb2b3d33f34d3516b6f2efdaa3bfa:/src/motif/checkbox.cpp?ds=sidebyside

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 7d40ee4330..0a5027d046 100644
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/checkbox.h"
+#include "wx/utils.h"
 
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
@@ -23,7 +24,7 @@
 #include "wx/motif/private.h"
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
-		    XtPointer ptr);
+                         XtPointer ptr);
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
@@ -32,46 +33,46 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+                        const wxPoint& pos,
+                        const wxSize& size, long style,
+                        const wxValidator& validator,
+                        const wxString& name)
 {
     SetName(name);
     SetValidator(validator);
     m_windowStyle = style;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
-
+    m_windowFont = parent->GetFont();
+    
     if (parent) parent->AddChild(this);
-
+    
     if ( id == -1 )
         m_windowId = NewControlId();
     else
         m_windowId = id;
-
+    
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-
+    
     XmString text = XmStringCreateSimple (label1);
     Widget parentWidget = (Widget) parent->GetClientWidget();
-
+    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
+    
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
-                                xmToggleButtonWidgetClass, parentWidget,
-                                XmNlabelString, text,
-                                NULL);
+        xmToggleButtonWidgetClass, parentWidget,
+        XmNfontList, fontList,
+        XmNlabelString, text,
+        NULL);
     XmStringFree (text);
-
+    
     XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
-		 (XtPointer) this);
-
+        (XtPointer) this);
+    
     XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
-
-    m_windowFont = parent->GetFont();
-    ChangeFont(FALSE);
-
+    
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
-
+    
     ChangeBackgroundColour();
     return TRUE;
 }
@@ -96,33 +97,33 @@ void wxCheckBox::Command (wxCommandEvent & event)
 
 // Bitmap checkbox
 bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+                              const wxPoint& pos,
+                              const wxSize& 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
-
+    
     return FALSE;
 }
 
-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
 {
     // TODO
 }
 
-void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxBitmapCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     // TODO
 }
@@ -139,17 +140,17 @@ bool wxBitmapCheckBox::GetValue() const
 }
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
-		    XtPointer ptr)
+                         XtPointer ptr)
 {
-  wxCheckBox *item = (wxCheckBox *) clientData;
-
-  if (item->InSetValue())
-    return;
+    wxCheckBox *item = (wxCheckBox *) clientData;
+    
+    if (item->InSetValue())
+        return;
     
-  wxCommandEvent event (wxEVT_COMMAND_CHECKBOX_CLICKED, item->GetId());
-  event.SetInt((int) item->GetValue ());
-  event.SetEventObject(item);
-  item->ProcessCommand (event);
+    wxCommandEvent event (wxEVT_COMMAND_CHECKBOX_CLICKED, item->GetId());
+    event.SetInt((int) item->GetValue ());
+    event.SetEventObject(item);
+    item->ProcessCommand (event);
 }
 
 void wxCheckBox::ChangeFont(bool keepOriginalSize)
@@ -159,19 +160,24 @@ void wxCheckBox::ChangeFont(bool keepOriginalSize)
 
 void wxCheckBox::ChangeBackgroundColour()
 {
-  wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour,
-			    (wxColour*) NULL);
-
-  XtVaSetValues ((Widget) m_mainWidget,
-		   XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
-		   XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
-		   XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
-		   XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
-		   NULL);
-
-  XtVaSetValues ((Widget) m_mainWidget,
-    		   XmNselectColor, g_itemColors[wxSELE_INDEX].pixel,
-               NULL);
+    wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour,
+        (wxColour*) NULL);
+    
+    XtVaSetValues ((Widget) m_mainWidget,
+        XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
+        XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
+        XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
+        XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
+        NULL);
+    
+    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+
+    // 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);
 }
 
 void wxCheckBox::ChangeForegroundColour()