Fixed refresh bug on early versions of MacOS X by

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index c71ed1a5ab2b50009854f235269b212a6d09ec8a..ee64792d713609a28a4dcef1475ee0b086037369 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -13,63 +13,68 @@
 #pragma implementation "checkbox.h"
 #endif
 
 #pragma implementation "checkbox.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+

 #include "wx/checkbox.h"
 #include "wx/checkbox.h"

+#include "wx/utils.h"

 
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

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

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
-#endif

 
 // 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;
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+    if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
+                                   name ) )
+        return FALSE;

 
 

-    char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-
-    XmString text = XmStringCreateSimple (label1);
+    wxString label1(wxStripMenuCodes(label));
+    wxXmString text( label1 );
+    

     Widget parentWidget = (Widget) parent->GetClientWidget();
     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);
-    XmStringFree (text);
-
-    XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
-                (XtPointer) this);
+        xmToggleButtonWidgetClass, parentWidget,
+        XmNfontList, fontList,
+        XmNlabelString, text(),
+        NULL);
+    
+    XtAddCallback( (Widget)m_mainWidget,
+                   XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
+                   (XtPointer)this );

 
     XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
 
     SetCanAddEventHandler(TRUE);
 
     XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
 
     SetCanAddEventHandler(TRUE);

-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
-
-    ChangeColour(m_mainWidget);
-    SetFont(* parent->GetFont());
+    AttachWidget( parent, m_mainWidget, (WXWidget)NULL,
+                  pos.x, pos.y, size.x, size.y );

 
 

+    ChangeBackgroundColour();

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -91,60 +96,37 @@ void wxCheckBox::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
     ProcessCommand (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)
-{
-    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 wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
+                         XtPointer WXUNUSED(ptr))

 {
 {

-    // TODO
-}
+    wxCheckBox *item = (wxCheckBox *) clientData;

 
 

-void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
-}
+    if (item->InSetValue())
+        return;

 
 

-void wxBitmapCheckBox::SetValue(bool val)
-{
-    // TODO
+    wxCommandEvent event (wxEVT_COMMAND_CHECKBOX_CLICKED, item->GetId());
+    event.SetInt((int) item->GetValue ());
+    event.SetEventObject(item);
+    item->ProcessCommand (event);

 }
 
 }
 

-bool wxBitmapCheckBox::GetValue() const
+void wxCheckBox::ChangeBackgroundColour()

 {
 {

-    // TODOD
-    return FALSE;
-}
-
-void wxCheckBoxCallback (Widget w, XtPointer clientData,
-                   XtPointer ptr)
-{
-  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);
+    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, selectPixel,
+        NULL);

 }
 }