X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/35821d8fe021a3aa3c59b50ad2c897616bf25da5..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/choice.cpp?ds=sidebyside diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index 740d574451..a73387523f 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "choice.h" #endif @@ -40,7 +40,29 @@ #include "wx/msw/private.h" +#if wxUSE_EXTENDED_RTTI +IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl,"wx/checkbox.h") + +WX_BEGIN_PROPERTIES_TABLE(wxChoice) + // TODO DELEGATES + WX_PROPERTY( Font , wxFont , SetFont , GetFont , ) + WX_PROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings ) + WX_PROPERTY( Selection ,int, SetSelection, GetSelection, ) +WX_END_PROPERTIES_TABLE() + +WX_BEGIN_HANDLERS_TABLE(wxChoice) +WX_END_HANDLERS_TABLE() + +WX_CONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) +#else IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) +#endif +/* + TODO PROPERTIES + selection (long) + content (list) + item +*/ // ============================================================================ // implementation @@ -251,8 +273,6 @@ wxString wxChoice::GetString(int n) const { wxLogLastError(wxT("SendMessage(CB_GETLBTEXT)")); } - - str.UngetWriteBuf(); } return str;