AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation fixes after the last commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-02-17 22:53:41 +00:00
parent c8531822d5
commit 0b06ac1f24
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/radiobox.h
View File

@ -60,7 +60,7 @@ public:
int GetSelection() const; int GetSelection() const;
wxString GetString( int n ) const; wxString GetString( int n ) const;
void SetLabel( const wxString& label ); void SetString( int n, const wxString& label );
void Show( int item, bool show ); void Show( int item, bool show );
void Enable( int item, bool enable ); void Enable( int item, bool enable );
@ -76,11 +76,13 @@ public:
#if WXWIN_COMPATIBILITY_2_2 #if WXWIN_COMPATIBILITY_2_2
int Number() const { return GetCount(); } int Number() const { return GetCount(); }
wxString GetLabel(int n) const { return GetString(n); } wxString GetLabel(int n) const { return GetString(n); }
void SetLabel( int item, const wxString& label ); void SetLabel( int item, const wxString& label )
{ SetString(item, label); }
#endif // WXWIN_COMPATIBILITY_2_2 #endif // WXWIN_COMPATIBILITY_2_2
// we have to override those to avoid virtual function name hiding // we have to override those to avoid virtual function name hiding
wxString GetLabel() const { return wxControl::GetLabel(); } wxString GetLabel() const { return wxControl::GetLabel(); }
void SetLabel( const wxString& label );
bool Show( bool show ); bool Show( bool show );
bool Enable( bool enable ); bool Enable( bool enable );

6
include/wx/gtk1/radiobox.h
View File

@ -60,7 +60,7 @@ public:
int GetSelection() const; int GetSelection() const;
wxString GetString( int n ) const; wxString GetString( int n ) const;
void SetLabel( const wxString& label ); void SetString( int n, const wxString& label );
void Show( int item, bool show ); void Show( int item, bool show );
void Enable( int item, bool enable ); void Enable( int item, bool enable );
@ -76,11 +76,13 @@ public:
#if WXWIN_COMPATIBILITY_2_2 #if WXWIN_COMPATIBILITY_2_2
int Number() const { return GetCount(); } int Number() const { return GetCount(); }
wxString GetLabel(int n) const { return GetString(n); } wxString GetLabel(int n) const { return GetString(n); }
void SetLabel( int item, const wxString& label ); void SetLabel( int item, const wxString& label )
{ SetString(item, label); }
#endif // WXWIN_COMPATIBILITY_2_2 #endif // WXWIN_COMPATIBILITY_2_2
// we have to override those to avoid virtual function name hiding // we have to override those to avoid virtual function name hiding
wxString GetLabel() const { return wxControl::GetLabel(); } wxString GetLabel() const { return wxControl::GetLabel(); }
void SetLabel( const wxString& label );
bool Show( bool show ); bool Show( bool show );
bool Enable( bool enable ); bool Enable( bool enable );

7
src/gtk/radiobox.cpp
View File

@ -510,13 +510,6 @@ wxString wxRadioBox::GetString( int n ) const
return wxString( label->label ); return wxString( label->label );
} }
wxString wxRadioBox::GetLabel( int item ) const
{
wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
return GetString( item );
}
void wxRadioBox::SetLabel( const wxString& label ) void wxRadioBox::SetLabel( const wxString& label )
{ {
wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );

7
src/gtk1/radiobox.cpp
View File

@ -510,13 +510,6 @@ wxString wxRadioBox::GetString( int n ) const
return wxString( label->label ); return wxString( label->label );
} }
wxString wxRadioBox::GetLabel( int item ) const
{
wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") );
return GetString( item );
}
void wxRadioBox::SetLabel( const wxString& label ) void wxRadioBox::SetLabel( const wxString& label )
{ {
wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );