added SetString(), deprecated SetLabel()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,29 +60,30 @@ public:
|
||||
int GetSelection() const;
|
||||
|
||||
wxString GetString( int n ) const;
|
||||
|
||||
wxString GetLabel( int item ) const;
|
||||
wxString GetLabel() const { return wxControl::GetLabel(); }
|
||||
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 );
|
||||
|
||||
bool Enable( bool enable );
|
||||
void Enable( int item, bool enable );
|
||||
|
||||
virtual wxString GetStringSelection() const;
|
||||
virtual bool SetStringSelection( const wxString& s );
|
||||
|
||||
int Number() const;
|
||||
int GetCount() const { return Number(); }
|
||||
int GetCount() const;
|
||||
int GetNumberOfRowsOrCols() const;
|
||||
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
|
||||
// --------------
|
||||
|
||||
|
@@ -60,29 +60,30 @@ public:
|
||||
int GetSelection() const;
|
||||
|
||||
wxString GetString( int n ) const;
|
||||
|
||||
wxString GetLabel( int item ) const;
|
||||
wxString GetLabel() const { return wxControl::GetLabel(); }
|
||||
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 );
|
||||
|
||||
bool Enable( bool enable );
|
||||
void Enable( int item, bool enable );
|
||||
|
||||
virtual wxString GetStringSelection() const;
|
||||
virtual bool SetStringSelection( const wxString& s );
|
||||
|
||||
int Number() const;
|
||||
int GetCount() const { return Number(); }
|
||||
int GetCount() const;
|
||||
int GetNumberOfRowsOrCols() const;
|
||||
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
|
||||
// --------------
|
||||
|
||||
|
Reference in New Issue
Block a user