X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8228b8932abaedadbf9568bb3a1eef3ae25fb2a3..bcf324bebe65cd7ee49c139533ceea52dceb4b91:/src/motif/radiobox.cpp diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp index 0eb64ebb3a..00303033a4 100644 --- a/src/motif/radiobox.cpp +++ b/src/motif/radiobox.cpp @@ -14,13 +14,12 @@ #if wxUSE_RADIOBOX -#ifdef __VMS -#define XtDisplay XTDISPLAY -#endif - #include "wx/radiobox.h" -#include "wx/utils.h" -#include "wx/arrstr.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/arrstr.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -48,6 +47,7 @@ void wxRadioBox::Init() m_selectedButton = -1; m_noItems = 0; m_noRowsOrCols = 0; + m_labelWidget = (WXWidget) 0; } bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -58,8 +58,9 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, { if( !CreateControl( parent, id, pos, size, style, val, name ) ) return false; + PreCreation(); - m_noItems = (size_t)n; + m_noItems = (unsigned int)n; m_noRowsOrCols = majorDim; SetMajorDim(majorDim == 0 ? n : majorDim, style); @@ -73,13 +74,13 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, XmNresizeWidth, True, NULL); - wxString label1(wxStripMenuCodes(title)); + wxString label1(GetLabelText(title)); if (!label1.empty()) { wxXmString text(label1); m_labelWidget = (WXWidget) - XtVaCreateManagedWidget( label1.c_str(), + XtVaCreateManagedWidget( label1.mb_str(), #if wxUSE_GADGETS style & wxCOLOURED ? xmLabelWidgetClass : xmLabelGadgetClass, @@ -117,10 +118,10 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, int i; for (i = 0; i < n; i++) { - wxString str(wxStripMenuCodes(choices[i])); + wxString str(GetLabelText(choices[i])); m_radioButtonLabels.push_back(str); Widget radioItem = XtVaCreateManagedWidget ( - wxConstCast(str.c_str(), char), + str.mb_str(), #if wxUSE_GADGETS xmToggleButtonGadgetClass, radioBoxWidget, #else @@ -134,18 +135,15 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, (XtPointer) this); } - ChangeFont(false); - SetSelection (0); XtRealizeWidget((Widget)m_mainWidget); XtManageChild (radioBoxWidget); XtManageChild ((Widget)m_mainWidget); + PostCreation(); AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y); - ChangeBackgroundColour(); - return true; } @@ -168,15 +166,15 @@ wxRadioBox::~wxRadioBox() m_mainWidget = (WXWidget) 0; } -void wxRadioBox::SetString(int item, const wxString& label) +void wxRadioBox::SetString(unsigned int item, const wxString& label) { if (!IsValid(item)) return; - Widget widget = (Widget) m_radioButtons[item]; + Widget widget = (Widget)m_radioButtons[item]; if (!label.empty()) { - wxString label1(wxStripMenuCodes(label)); + wxString label1(GetLabelText(label)); wxXmString text( label1 ); m_radioButtonLabels[item] = label1; XtVaSetValues (widget, @@ -197,8 +195,8 @@ void wxRadioBox::SetSelection(int n) XmToggleButtonSetState ((Widget) m_radioButtons[n], True, False); - for (size_t i = 0; i < m_noItems; i++) - if (i != n) + for (unsigned int i = 0; i < m_noItems; i++) + if (i != (unsigned int)n) XmToggleButtonSetState ((Widget) m_radioButtons[i], False, False); m_inSetValue = false; @@ -211,7 +209,7 @@ int wxRadioBox::GetSelection() const } // Find string for position -wxString wxRadioBox::GetString(int n) const +wxString wxRadioBox::GetString(unsigned int n) const { if (!IsValid(n)) return wxEmptyString; @@ -243,7 +241,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) } // Enable a specific button -bool wxRadioBox::Enable(int n, bool enable) +bool wxRadioBox::Enable(unsigned int n, bool enable) { if (!IsValid(n)) return false; @@ -258,7 +256,7 @@ bool wxRadioBox::Enable(bool enable) if ( !wxControl::Enable(enable) ) return false; - for (size_t i = 0; i < m_noItems; i++) + for (unsigned int i = 0; i < m_noItems; i++) XtSetSensitive ((Widget) m_radioButtons[i], (Boolean) enable); return true; @@ -271,7 +269,7 @@ bool wxRadioBox::Show(bool show) } // Show a specific button -bool wxRadioBox::Show(int n, bool show) +bool wxRadioBox::Show(unsigned int n, bool show) { // This method isn't complete, and we try do do our best... // It's main purpose isn't for allowing Show/Unshow dynamically, @@ -305,8 +303,8 @@ bool wxRadioBox::Show(int n, bool show) wxString wxRadioBox::GetStringSelection () const { int sel = GetSelection (); - if (sel > -1) - return this->GetString (sel); + if (sel != wxNOT_FOUND) + return this->GetString((unsigned int)sel); else return wxEmptyString; } @@ -333,7 +331,7 @@ void wxRadioBox::ChangeFont(bool keepOriginalSize) { wxWindow::ChangeFont(keepOriginalSize); - for (size_t i = 0; i < m_noItems; i++) + for (unsigned int i = 0; i < m_noItems; i++) { WXWidget radioButton = m_radioButtons[i]; @@ -347,9 +345,10 @@ void wxRadioBox::ChangeBackgroundColour() { wxWindow::ChangeBackgroundColour(); - int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget)); + wxColour colour = *wxBLACK; + WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget)); - for (size_t i = 0; i < m_noItems; i++) + for (unsigned int i = 0; i < m_noItems; i++) { WXWidget radioButton = m_radioButtons[i]; @@ -365,7 +364,7 @@ void wxRadioBox::ChangeForegroundColour() { wxWindow::ChangeForegroundColour(); - for (size_t i = 0; i < m_noItems; i++) + for (unsigned int i = 0; i < m_noItems; i++) { WXWidget radioButton = m_radioButtons[i]; @@ -381,11 +380,11 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData, wxRadioBox *item = (wxRadioBox *) clientData; int sel = -1; - int i; + unsigned int i; const wxWidgetArray& buttons = item->GetRadioButtons(); for (i = 0; i < item->GetCount(); i++) if (((Widget)buttons[i]) == w) - sel = i; + sel = (int)i; item->SetSel(sel); if (item->InSetValue())