compilation fix for !wxUSE_CHOICE (patch 629092)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -129,7 +129,8 @@ public:
|
|||||||
#if wxUSE_CHOICE
|
#if wxUSE_CHOICE
|
||||||
wxChoice *m_choice,
|
wxChoice *m_choice,
|
||||||
*m_choiceSorted;
|
*m_choiceSorted;
|
||||||
#endif
|
#endif // wxUSE_CHOICE
|
||||||
|
|
||||||
wxComboBox *m_combo;
|
wxComboBox *m_combo;
|
||||||
wxRadioBox *m_radio;
|
wxRadioBox *m_radio;
|
||||||
wxGauge *m_gauge,
|
wxGauge *m_gauge,
|
||||||
@@ -308,7 +309,10 @@ private:
|
|||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
|
|
||||||
static void SetListboxClientData(const wxChar *name, wxListBox *control);
|
static void SetListboxClientData(const wxChar *name, wxListBox *control);
|
||||||
|
|
||||||
|
#if wxUSE_CHOICE
|
||||||
static void SetChoiceClientData(const wxChar *name, wxChoice *control);
|
static void SetChoiceClientData(const wxChar *name, wxChoice *control);
|
||||||
|
#endif // wxUSE_CHOICE
|
||||||
|
|
||||||
IMPLEMENT_APP(MyApp)
|
IMPLEMENT_APP(MyApp)
|
||||||
|
|
||||||
@@ -1715,6 +1719,8 @@ static void SetListboxClientData(const wxChar *name, wxListBox *control)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if wxUSE_CHOICE
|
||||||
|
|
||||||
static void SetChoiceClientData(const wxChar *name, wxChoice *control)
|
static void SetChoiceClientData(const wxChar *name, wxChoice *control)
|
||||||
{
|
{
|
||||||
size_t count = control->GetCount();
|
size_t count = control->GetCount();
|
||||||
@@ -1727,3 +1733,5 @@ static void SetChoiceClientData(const wxChar *name, wxChoice *control)
|
|||||||
control->SetClientObject(n, new wxStringClientData(s));
|
control->SetClientObject(n, new wxStringClientData(s));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // wxUSE_CHOICE
|
||||||
|
Reference in New Issue
Block a user