Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linup API of wxRadioBox::Show on all ports. Move wxRadioBox::IsValid from wxUniversal to base class (+ GTK which do not use base class) and use it where applicable. Minor source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-23 16:39:25 +00:00
parent 14fc1a0c5c
commit 789f679516
12 changed files with 65 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/msw/radiobox.cpp
View File

@@ -366,7 +366,7 @@ int wxRadioBox::GetNumHor() const
void wxRadioBox::SetString(int item, const wxString& label)
{
wxCHECK_RET( item >= 0 && item < GetCount(), wxT("invalid radiobox index") );
wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );
m_radioWidth[item] =
m_radioHeight[item] = wxDefaultCoord;
@@ -376,7 +376,7 @@ void wxRadioBox::SetString(int item, const wxString& label)
void wxRadioBox::SetSelection(int N)
{
wxCHECK_RET( (N >= 0) && (N < GetCount()), wxT("invalid radiobox index") );
wxCHECK_RET( IsValid(N), wxT("invalid radiobox index") );
// unselect the old button
if ( m_selectedButton != wxNOT_FOUND )
@@ -391,7 +391,7 @@ void wxRadioBox::SetSelection(int N)
// Find string for position
wxString wxRadioBox::GetString(int item) const
{
wxCHECK_MSG( item >= 0 && item < GetCount(), wxEmptyString,
wxCHECK_MSG( IsValid(item), wxEmptyString,
wxT("invalid radiobox index") );
return wxGetWindowText((*m_radioButtons)[item]);
@@ -410,20 +410,23 @@ void wxRadioBox::SetFocus()
// Enable a specific button
bool wxRadioBox::Enable(int item, bool enable)
{
wxCHECK_MSG( item >= 0 && item < GetCount(), false,
wxCHECK_MSG( IsValid(item), false,
wxT("invalid item in wxRadioBox::Enable()") );
::EnableWindow((*m_radioButtons)[item], enable);
return true;
BOOL ret = ::EnableWindow((*m_radioButtons)[item], enable);
return (ret == 0) == enable;
}
// Show a specific button
void wxRadioBox::Show(int item, bool show)
bool wxRadioBox::Show(int item, bool show)
{
wxCHECK_RET( item >= 0 && item < GetCount(),
wxCHECK_MSG( IsValid(item), false,
wxT("invalid item in wxRadioBox::Show()") );
::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE);
BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE);
return (ret != 0) == show;
}
WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)