X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de6185e212ebc37ff11ff70278e3c4f68419b097..662ba874795045558374a61c85a7e3c2de5bbdbb:/src/motif/checkbox.cpp diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp index 6d03da153a..6a68b1009b 100644 --- a/src/motif/checkbox.cpp +++ b/src/motif/checkbox.cpp @@ -12,10 +12,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __VMS -#define XtDisplay XTDISPLAY -#endif - #include "wx/checkbox.h" #ifndef WX_PRECOMP @@ -44,14 +40,11 @@ #define wxHAS_3STATE 0 #endif - #include "wx/motif/private.h" void wxCheckBoxCallback (Widget w, XtPointer clientData, XtPointer ptr); -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) - // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, @@ -62,9 +55,9 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, if( !wxControl::CreateControl( parent, id, pos, size, style, validator, name ) ) return false; + PreCreation(); - wxString label1(wxStripMenuCodes(label)); - wxXmString text( label1 ); + wxXmString text( GetLabelText(label) ); Widget parentWidget = (Widget) parent->GetClientWidget(); @@ -86,10 +79,10 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, XmToggleButtonSetState ((Widget) m_mainWidget, False, True); + PostCreation(); AttachWidget( parent, m_mainWidget, (WXWidget)NULL, pos.x, pos.y, size.x, size.y ); - ChangeBackgroundColour(); return true; } @@ -145,8 +138,11 @@ void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData, void wxCheckBox::ChangeBackgroundColour() { + if (!m_backgroundColour.IsOk()) + return; + wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour, - (wxColour*) NULL); + NULL); XtVaSetValues ((Widget) m_mainWidget, XmNbackground, g_itemColors[wxBACK_INDEX].pixel, @@ -156,13 +152,13 @@ void wxCheckBox::ChangeBackgroundColour() NULL); wxColour colour = *wxBLACK; - int selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget)); + WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget)); // 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); + NULL); } void wxCheckBox::DoSet3StateValue(wxCheckBoxState state) @@ -220,7 +216,7 @@ wxCheckBoxState wxCheckBox::DoGet3StateValue() const #if wxUSE_TOGGLEBTN -DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED) +wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent ); IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl) bool wxToggleButton::Create( wxWindow* parent, wxWindowID id, @@ -255,4 +251,4 @@ bool wxToggleButton::Create( wxWindow* parent, wxWindowID id, return true; } -#endif // wxUSE_TOGGLEBUTTON +#endif // wxUSE_TOGGLEBTN