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

added SetString(), deprecated SetLabel()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-02-17 22:45:08 +00:00
parent 89c986535c
commit c8531822d5
2 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ public:
const wxString choices[] = (const wxString *) NULL, const wxString choices[] = (const wxString *) NULL,
int majorDim = 1, int majorDim = 1,
long style = wxRA_HORIZONTAL, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr) const wxString& name = wxRadioBoxNameStr)
{ {
Init(); Init();
@@ -52,40 +52,41 @@ public:
const wxString choices[] = (const wxString *) NULL, const wxString choices[] = (const wxString *) NULL,
int majorDim = 0, int majorDim = 0,
long style = wxRA_HORIZONTAL, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr); const wxString& name = wxRadioBoxNameStr);
int FindString( const wxString& s) const; int FindString( const wxString& s) const;
void SetSelection( int n ); void SetSelection( int n );
int GetSelection() const; int GetSelection() const;
wxString GetString( int n ) const; wxString GetString( int n ) const;
wxString GetLabel( int item ) const;
wxString GetLabel() const { return wxControl::GetLabel(); }
void SetLabel( const wxString& label ); void SetLabel( const wxString& label );
void SetLabel( int item, const wxString& label );
/* doesn't work */
void SetLabel( int item, wxBitmap *bitmap );
bool Show( bool show );
void Show( int item, bool show ); void Show( int item, bool show );
bool Enable( bool enable );
void Enable( int item, bool enable ); void Enable( int item, bool enable );
virtual wxString GetStringSelection() const; virtual wxString GetStringSelection() const;
virtual bool SetStringSelection( const wxString& s ); virtual bool SetStringSelection( const wxString& s );
int Number() const; int GetCount() const;
int GetCount() const { return Number(); }
int GetNumberOfRowsOrCols() const; int GetNumberOfRowsOrCols() const;
void SetNumberOfRowsOrCols( int n ); void SetNumberOfRowsOrCols( int n );
// for compatibility only, don't use these methods in new code!
#if WXWIN_COMPATIBILITY_2_2
int Number() const { return GetCount(); }
wxString GetLabel(int n) const { return GetString(n); }
void SetLabel( int item, const wxString& label );
#endif // WXWIN_COMPATIBILITY_2_2
// we have to override those to avoid virtual function name hiding
wxString GetLabel() const { return wxControl::GetLabel(); }
bool Show( bool show );
bool Enable( bool enable );
// implementation // implementation
// -------------- // --------------
void SetFocus(); void SetFocus();
void GtkDisableEvents(); void GtkDisableEvents();
void GtkEnableEvents(); void GtkEnableEvents();
@@ -98,7 +99,7 @@ public:
virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO ); virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
virtual void OnInternalIdle(); virtual void OnInternalIdle();
bool m_hasFocus, bool m_hasFocus,
m_lostFocus; m_lostFocus;
int m_majorDim; int m_majorDim;

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

@@ -34,7 +34,7 @@ public:
const wxString choices[] = (const wxString *) NULL, const wxString choices[] = (const wxString *) NULL,
int majorDim = 1, int majorDim = 1,
long style = wxRA_HORIZONTAL, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr) const wxString& name = wxRadioBoxNameStr)
{ {
Init(); Init();
@@ -52,40 +52,41 @@ public:
const wxString choices[] = (const wxString *) NULL, const wxString choices[] = (const wxString *) NULL,
int majorDim = 0, int majorDim = 0,
long style = wxRA_HORIZONTAL, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr); const wxString& name = wxRadioBoxNameStr);
int FindString( const wxString& s) const; int FindString( const wxString& s) const;
void SetSelection( int n ); void SetSelection( int n );
int GetSelection() const; int GetSelection() const;
wxString GetString( int n ) const; wxString GetString( int n ) const;
wxString GetLabel( int item ) const;
wxString GetLabel() const { return wxControl::GetLabel(); }
void SetLabel( const wxString& label ); void SetLabel( const wxString& label );
void SetLabel( int item, const wxString& label );
/* doesn't work */
void SetLabel( int item, wxBitmap *bitmap );
bool Show( bool show );
void Show( int item, bool show ); void Show( int item, bool show );
bool Enable( bool enable );
void Enable( int item, bool enable ); void Enable( int item, bool enable );
virtual wxString GetStringSelection() const; virtual wxString GetStringSelection() const;
virtual bool SetStringSelection( const wxString& s ); virtual bool SetStringSelection( const wxString& s );
int Number() const; int GetCount() const;
int GetCount() const { return Number(); }
int GetNumberOfRowsOrCols() const; int GetNumberOfRowsOrCols() const;
void SetNumberOfRowsOrCols( int n ); void SetNumberOfRowsOrCols( int n );
// for compatibility only, don't use these methods in new code!
#if WXWIN_COMPATIBILITY_2_2
int Number() const { return GetCount(); }
wxString GetLabel(int n) const { return GetString(n); }
void SetLabel( int item, const wxString& label );
#endif // WXWIN_COMPATIBILITY_2_2
// we have to override those to avoid virtual function name hiding
wxString GetLabel() const { return wxControl::GetLabel(); }
bool Show( bool show );
bool Enable( bool enable );
// implementation // implementation
// -------------- // --------------
void SetFocus(); void SetFocus();
void GtkDisableEvents(); void GtkDisableEvents();
void GtkEnableEvents(); void GtkEnableEvents();
@@ -98,7 +99,7 @@ public:
virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO ); virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
virtual void OnInternalIdle(); virtual void OnInternalIdle();
bool m_hasFocus, bool m_hasFocus,
m_lostFocus; m_lostFocus;
int m_majorDim; int m_majorDim;