Mini-fix for wxStaticBitmap

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index c71ed1a5ab2b50009854f235269b212a6d09ec8a..160e3a6c81b861edf81804e5a4488e1e705e48e8 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/checkbox.h"
 #endif
 
 #include "wx/checkbox.h"

+#include "wx/utils.h"

 
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>


@@ -23,7 +24,7 @@
 #include "wx/motif/private.h"
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
 #include "wx/motif/private.h"
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,

-                   XtPointer ptr);
+                         XtPointer ptr);

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)


@@ -32,44 +33,47 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
 // 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;
 {
     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 (parent) parent->AddChild(this);

-
+    

     if ( id == -1 )
         m_windowId = NewControlId();
     else
         m_windowId = id;
     if ( id == -1 )
         m_windowId = NewControlId();
     else
         m_windowId = id;

-
+    

     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);

-
+    

     XmString text = XmStringCreateSimple (label1);
     Widget parentWidget = (Widget) parent->GetClientWidget();
     XmString text = XmStringCreateSimple (label1);
     Widget parentWidget = (Widget) parent->GetClientWidget();

-
+    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
+    

     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",

-                                xmToggleButtonWidgetClass, parentWidget,
-                                XmNlabelString, text,
-                                NULL);
+        xmToggleButtonWidgetClass, parentWidget,
+        XmNfontList, fontList,
+        XmNlabelString, text,
+        NULL);

     XmStringFree (text);
     XmStringFree (text);

-
+    

     XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
     XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,

-                (XtPointer) this);
-
+        (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);
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);

-
-    ChangeColour(m_mainWidget);
-    SetFont(* parent->GetFont());
-
+    
+    ChangeBackgroundColour();

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -93,33 +97,33 @@ void wxCheckBox::Command (wxCommandEvent & event)
 
 // Bitmap checkbox
 bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
 
 // 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;
 {
     SetName(name);
     SetValidator(validator);
     m_windowStyle = style;

-
+    

     if (parent) parent->AddChild(this);
     if (parent) parent->AddChild(this);

-
+    

     if ( id == -1 )
         m_windowId = NewControlId();
     else
         m_windowId = id;
     if ( id == -1 )
         m_windowId = NewControlId();
     else
         m_windowId = id;

-
+    

     // TODO: Create the bitmap checkbox
     // TODO: Create the bitmap checkbox

-
+    

     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)

 {
     // TODO
 }
 
 {
     // 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
 }
 {
     // TODO
 }


@@ -136,15 +140,47 @@ bool wxBitmapCheckBox::GetValue() const
 }
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
 }
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,

-                   XtPointer ptr)
+                         XtPointer ptr)

 {
 {

-  wxCheckBox *item = (wxCheckBox *) clientData;
+    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);
+}

 
 

-  if (item->InSetValue())
-    return;
+void wxCheckBox::ChangeFont(bool keepOriginalSize)
+{
+    wxWindow::ChangeFont(keepOriginalSize);
+}
+
+void wxCheckBox::ChangeBackgroundColour()
+{
+    wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour,
+        (wxColour*) NULL);

     
     

-  wxCommandEvent event (wxEVT_COMMAND_CHECKBOX_CLICKED, item->GetId());
-  event.SetInt((int) item->GetValue ());
-  event.SetEventObject(item);
-  item->ProcessCommand (event);
+    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()
+{
+    wxWindow::ChangeForegroundColour();

 }
 }