X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/197dd9af26230291b156c504506fed47a4d7420b..5efec4430047b3fe3b18ea6fcb0ff103aa42764a:/src/msw/radiobox.cpp?ds=sidebyside diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index bd865c7542..48666d0859 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -110,7 +110,7 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) } } - wxASSERT_MSG( selectedButton != -1, _T("click from alien button?") ); + wxASSERT_MSG( selectedButton != -1, wxT("click from alien button?") ); if ( selectedButton != m_selectedButton ) { @@ -257,7 +257,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, } // Create a dummy radio control to end the group. - (void)CreateWindowEx(0, RADIO_CLASS, _T(""), WS_GROUP | RADIO_FLAGS, + (void)CreateWindowEx(0, RADIO_CLASS, wxT(""), WS_GROUP | RADIO_FLAGS, 0, 0, 0, 0, hwndParent, (HMENU)NewControlId(), wxGetInstance(), NULL); @@ -289,14 +289,14 @@ wxRadioBox::~wxRadioBox() wxString wxRadioBox::GetLabel(int item) const { - wxCHECK_MSG( item >= 0 && item < m_noItems, _T(""), _T("invalid radiobox index") ); + wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") ); return wxGetWindowText(m_radioButtons[item]); } void wxRadioBox::SetLabel(int item, const wxString& label) { - wxCHECK_RET( item >= 0 && item < m_noItems, _T("invalid radiobox index") ); + wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") ); m_radioWidth[item] = m_radioHeight[item] = -1; SetWindowText((HWND)m_radioButtons[item], label.c_str()); @@ -308,7 +308,7 @@ void wxRadioBox::SetLabel(int item, wxBitmap *bitmap) m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN; m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN; */ - wxFAIL_MSG(_T("not implemented")); + wxFAIL_MSG(wxT("not implemented")); } int wxRadioBox::FindString(const wxString& s) const @@ -324,7 +324,7 @@ int wxRadioBox::FindString(const wxString& s) const void wxRadioBox::SetSelection(int N) { - wxCHECK_RET( (N >= 0) && (N < m_noItems), _T("invalid radiobox index") ); + wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") ); // Following necessary for Win32s, because Win32s translate BM_SETCHECK if (m_selectedButton >= 0 && m_selectedButton < m_noItems) @@ -440,7 +440,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) height = totHeight + extraHeight; - else + else height = heightOld; } @@ -591,7 +591,7 @@ bool wxRadioBox::Show(bool show) void wxRadioBox::Enable(int item, bool enable) { wxCHECK_RET( item >= 0 && item < m_noItems, - _T("invalid item in wxRadioBox::Enable()") ); + wxT("invalid item in wxRadioBox::Enable()") ); ::EnableWindow((HWND) m_radioButtons[item], enable); } @@ -612,7 +612,7 @@ bool wxRadioBox::Enable(bool enable) void wxRadioBox::Show(int item, bool show) { wxCHECK_RET( item >= 0 && item < m_noItems, - _T("invalid item in wxRadioBox::Show()") ); + wxT("invalid item in wxRadioBox::Show()") ); ::ShowWindow((HWND)m_radioButtons[item], show ? SW_SHOW : SW_HIDE); } @@ -718,13 +718,13 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, { bool processed = TRUE; if ( msg != WM_KEYDOWN ) - processed = FALSE; + processed = FALSE; if ( processed ) { wxRadioBox *radiobox = (wxRadioBox *)::GetWindowLong(hwnd, GWL_USERDATA); - wxCHECK_MSG( radiobox, 0, _T("radio button without radio box?") ); + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); int sel = radiobox->GetSelection(); @@ -759,7 +759,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, // fall through default: - processed = FALSE; + processed = FALSE; } if ( processed )