X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c8a980fc412792e64256724e02e9d387ee38e21..b0fb0f3c71c527b5c5cb839355c88766b6f8c888:/include/wx/choice.h diff --git a/include/wx/choice.h b/include/wx/choice.h index b0d2a70770..b6600e3592 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -16,10 +16,12 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "choicebase.h" #endif +#if wxUSE_CHOICE + #include "wx/ctrlsub.h" // the base class // ---------------------------------------------------------------------------- @@ -35,6 +37,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; class WXDLLEXPORT wxChoiceBase : public wxControlWithItems { public: + wxChoiceBase() { } + virtual ~wxChoiceBase(); + // all generic methods are in wxControlWithItems // single selection logic @@ -44,7 +49,7 @@ public: // don't override this virtual void Select(int n) { SetSelection(n); } - // set/get the number of columns in the control (as they're not supporte on + // set/get the number of columns in the control (as they're not supported on // most platforms, they do nothing by default) virtual void SetColumns(int WXUNUSED(n) = 1 ) { } virtual int GetColumns() const { return 1 ; } @@ -52,27 +57,31 @@ public: // emulate selecting the item event.GetInt() void Command(wxCommandEvent& event); +private: + DECLARE_NO_COPY_CLASS(wxChoiceBase) }; // ---------------------------------------------------------------------------- // include the platform-dependent class definition // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) +#if defined(__WXUNIVERSAL__) + #include "wx/univ/choice.h" +#elif defined(__WXMSW__) #include "wx/msw/choice.h" #elif defined(__WXMOTIF__) #include "wx/motif/choice.h" #elif defined(__WXGTK__) #include "wx/gtk/choice.h" -#elif defined(__WXQT__) - #include "wx/qt/choice.h" #elif defined(__WXMAC__) #include "wx/mac/choice.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/choice.h" #elif defined(__WXPM__) #include "wx/os2/choice.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/choice.h" #endif +#endif // wxUSE_CHOICE + #endif // _WX_CHOICE_H_BASE_