X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..e16ebee6a9cb46e71b5e15fe14edf61fd790bb14:/src/motif/checkbox.cpp diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp index 0a5027d046..0f90243a26 100644 --- a/src/motif/checkbox.cpp +++ b/src/motif/checkbox.cpp @@ -43,36 +43,42 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, 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; - + +#if 0 // gcc 2.95 doesn't like this apparently 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)); +#endif + + wxXmString text( label ); + Widget parentWidget = (Widget) parent->GetClientWidget(); + XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget)); + m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle", xmToggleButtonWidgetClass, parentWidget, XmNfontList, fontList, - XmNlabelString, text, + XmNlabelString, text(), NULL); +#if 0 XmStringFree (text); +#endif 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; } @@ -96,39 +102,39 @@ 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, +bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *WXUNUSED(label), + const wxPoint& WXUNUSED(pos), + const wxSize& WXUNUSED(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& WXUNUSED(bitmap)) { // TODO } -void wxBitmapCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) +void wxBitmapCheckBox::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(sizeFlags)) { // TODO } -void wxBitmapCheckBox::SetValue(bool val) +void wxBitmapCheckBox::SetValue(bool WXUNUSED(val)) { // TODO } @@ -139,14 +145,14 @@ bool wxBitmapCheckBox::GetValue() const return FALSE; } -void wxCheckBoxCallback (Widget w, XtPointer clientData, - XtPointer ptr) +void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData, + XtPointer WXUNUSED(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); @@ -162,14 +168,14 @@ 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