X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bb6408c2631988fab9925014c6619358bf867de..80d895cd3f624f28424cc45b9b516bf439da9c19:/src/motif/checkbox.cpp?ds=sidebyside diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp index 8755f5d5a4..4b582b16c7 100644 --- a/src/motif/checkbox.cpp +++ b/src/motif/checkbox.cpp @@ -14,6 +14,17 @@ #endif #include "wx/checkbox.h" +#include "wx/utils.h" + +#include +#include +#include +#include + +#include "wx/motif/private.h" + +void wxCheckBoxCallback (Widget w, XtPointer clientData, + XtPointer ptr); #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) @@ -22,14 +33,17 @@ 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_font = parent->GetFont(); if (parent) parent->AddChild(this); @@ -38,30 +52,41 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, else m_windowId = id; - // TODO: create checkbox + char* label1 = (label.IsNull() ? "" : (char*) (const char*) label); - return FALSE; -} + XmString text = XmStringCreateSimple (label1); + Widget parentWidget = (Widget) parent->GetClientWidget(); + XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget)); -void wxCheckBox::SetLabel(const wxString& label) -{ - // TODO -} + m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle", + xmToggleButtonWidgetClass, parentWidget, + XmNfontList, fontList, + XmNlabelString, text, + NULL); + XmStringFree (text); -void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags) -{ - // TODO + 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; } void wxCheckBox::SetValue(bool val) { - // TODO + m_inSetValue = TRUE; + XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) val, TRUE); + m_inSetValue = FALSE; } bool wxCheckBox::GetValue() const { - // TODO - return FALSE; + return (XmToggleButtonGetState ((Widget) m_mainWidget) != 0); } void wxCheckBox::Command (wxCommandEvent & event) @@ -72,10 +97,10 @@ 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); @@ -93,12 +118,12 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l 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 } @@ -114,4 +139,48 @@ bool wxBitmapCheckBox::GetValue() const 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); +} + +void wxCheckBox::ChangeFont(bool keepOriginalSize) +{ + wxWindow::ChangeFont(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); + + 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(); +}