From 6e76ef723071950be942cf81c39165298e02d623 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 29 Oct 2002 00:06:11 +0000 Subject: [PATCH] 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 --- samples/controls/controls.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 69df5f89a5..ad8bc2532d 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -129,7 +129,8 @@ public: #if wxUSE_CHOICE wxChoice *m_choice, *m_choiceSorted; -#endif +#endif // wxUSE_CHOICE + wxComboBox *m_combo; wxRadioBox *m_radio; wxGauge *m_gauge, @@ -308,7 +309,10 @@ private: //---------------------------------------------------------------------- static void SetListboxClientData(const wxChar *name, wxListBox *control); + +#if wxUSE_CHOICE static void SetChoiceClientData(const wxChar *name, wxChoice *control); +#endif // wxUSE_CHOICE 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) { size_t count = control->GetCount(); @@ -1727,3 +1733,5 @@ static void SetChoiceClientData(const wxChar *name, wxChoice *control) control->SetClientObject(n, new wxStringClientData(s)); } } + +#endif // wxUSE_CHOICE