Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -216,9 +216,9 @@ int wxComboBox::DoAppend(const wxString& item)
|
|||||||
int wxComboBox::DoInsert(const wxString& item, int pos)
|
int wxComboBox::DoInsert(const wxString& item, int pos)
|
||||||
{
|
{
|
||||||
wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
|
wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
|
||||||
wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
|
wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
|
||||||
|
|
||||||
if (pos == GetCount())
|
if ((size_t)pos == GetCount())
|
||||||
return DoAppend(item);
|
return DoAppend(item);
|
||||||
|
|
||||||
wxXmString str( item.c_str() );
|
wxXmString str( item.c_str() );
|
||||||
|
@@ -198,7 +198,7 @@ void wxRadioBox::SetSelection(int n)
|
|||||||
XmToggleButtonSetState ((Widget) m_radioButtons[n], True, False);
|
XmToggleButtonSetState ((Widget) m_radioButtons[n], True, False);
|
||||||
|
|
||||||
for (size_t i = 0; i < m_noItems; i++)
|
for (size_t i = 0; i < m_noItems; i++)
|
||||||
if (i != n)
|
if (i != (size_t)n)
|
||||||
XmToggleButtonSetState ((Widget) m_radioButtons[i], False, False);
|
XmToggleButtonSetState ((Widget) m_radioButtons[i], False, False);
|
||||||
|
|
||||||
m_inSetValue = false;
|
m_inSetValue = false;
|
||||||
@@ -381,11 +381,11 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
|
|||||||
|
|
||||||
wxRadioBox *item = (wxRadioBox *) clientData;
|
wxRadioBox *item = (wxRadioBox *) clientData;
|
||||||
int sel = -1;
|
int sel = -1;
|
||||||
int i;
|
size_t i;
|
||||||
const wxWidgetArray& buttons = item->GetRadioButtons();
|
const wxWidgetArray& buttons = item->GetRadioButtons();
|
||||||
for (i = 0; i < item->GetCount(); i++)
|
for (i = 0; i < item->GetCount(); i++)
|
||||||
if (((Widget)buttons[i]) == w)
|
if (((Widget)buttons[i]) == w)
|
||||||
sel = i;
|
sel = (int)i;
|
||||||
item->SetSel(sel);
|
item->SetSel(sel);
|
||||||
|
|
||||||
if (item->InSetValue())
|
if (item->InSetValue())
|
||||||
|
Reference in New Issue
Block a user