X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc11cc69186f64a7729cd3b5a892dd487b9f6f0c..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/src/os2/radiobox.cpp?ds=sidebyside diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp index c65677b170..6b09f22646 100644 --- a/src/os2/radiobox.cpp +++ b/src/os2/radiobox.cpp @@ -18,7 +18,7 @@ #ifndef WX_PRECOMP #include - #include "wx/wxchar.h" + #include "wx/crt.h" #include "wx/string.h" #include "wx/bitmap.h" #include "wx/brush.h" @@ -145,11 +145,10 @@ bool wxRadioBox::Create( wxWindow* pParent, const wxValidator& rVal, const wxString& rsName ) { - wxColour vColour; + wxColour vColour(*wxBLACK); LONG lColor; HWND hWndParent = GetHwndOf(pParent); - vColour.Set(wxString(wxT("BLACK"))); m_backgroundColour = pParent->GetBackgroundColour(); m_nSelectedButton = -1; m_nNoItems = 0; @@ -782,7 +781,7 @@ void wxRadioBox::SetString(unsigned int nItem, const wxString& rsLabel) wxCHECK_RET( IsValid(nItem), wxT("invalid radiobox index") ); m_pnRadioWidth[nItem] = m_pnRadioHeight[nItem] = -1; - ::WinSetWindowText((HWND)m_ahRadioButtons[nItem], (PSZ)rsLabel.c_str()); + ::WinSetWindowText((HWND)m_ahRadioButtons[nItem], rsLabel.c_str()); } // end of wxRadioBox::SetString bool wxRadioBox::SetStringSelection(const wxString& rsStr)