X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18c5099700db5b60042618077ae943ba65e7a7a8..24f932d22a085ce899b94c98578f475782c75bf6:/src/msw/choice.cpp diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index 110d9e0b91..fc53d9298d 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_CHOICE + #ifndef WX_PRECOMP #include "wx/choice.h" #include "wx/utils.h" @@ -81,7 +83,7 @@ bool wxChoice::Create(wxWindow *parent, // A choice/combobox normally has a white background (or other, depending // on global settings) rather than inheriting the parent's background colour. - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); for ( int i = 0; i < n; i++ ) { @@ -189,14 +191,11 @@ int wxChoice::FindString(const wxString& s) const #endif // Watcom/!Watcom } -void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s)) +void wxChoice::SetString(int n, const wxString& s) { - wxFAIL_MSG(wxT("not implemented")); - -#if 0 // should do this, but no Insert() so far - Delete(n); - Insert(n + 1, s); -#endif + wxCHECK_RET( (n>=0)&&(n<GetCount()), wxT("invalid item index in wxChoice::SetString") ); + SendMessage(GetHwnd(), CB_DELETESTRING, n, 0); + SendMessage(GetHwnd(), CB_INSERTSTRING, n, (LONG)s.c_str() ); } wxString wxChoice::GetString(int n) const @@ -389,7 +388,7 @@ WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED( wxColour colBack = GetBackgroundColour(); if (!IsEnabled()) - colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); + colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); ::SetBkColor(hdc, wxColourToRGB(colBack)); ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); @@ -399,4 +398,4 @@ WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED( return (WXHBRUSH)brush->GetResourceHandle(); } - +#endif // wxUSE_CHOICE