#endif
#include "wx/checkbox.h"
+#include "wx/utils.h"
#include <Xm/Label.h>
#include <Xm/LabelG.h>
m_windowStyle = style;
m_backgroundColour = parent->GetBackgroundColour();
m_foregroundColour = parent->GetForegroundColour();
- m_windowFont = parent->GetFont();
-
+ m_font = 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));
-
+ XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
+
m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
xmToggleButtonWidgetClass, parentWidget,
XmNfontList, fontList,
XmNlabelString, text,
NULL);
XmStringFree (text);
-
+
XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
(XtPointer) this);
-
+
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;
}
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
}
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);
{
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, g_itemColors[wxSELE_INDEX].pixel,
+ XmNselectColor, selectPixel,
NULL);
}