GetClientData(int n) should be const (part of patch 649438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -68,24 +68,24 @@ public:
|
||||
void Append( const wxString &item );
|
||||
void Append( const wxString &item, void* clientData );
|
||||
void Append( const wxString &item, wxClientData* clientData );
|
||||
|
||||
|
||||
void Insert( const wxString &item, int pos );
|
||||
void Insert( const wxString &item, int pos, void* clientData );
|
||||
void Insert( const wxString &item, int pos, wxClientData* clientData );
|
||||
|
||||
|
||||
void SetClientData( int n, void* clientData );
|
||||
void* GetClientData( int n );
|
||||
void* GetClientData( int n ) const;
|
||||
void SetClientObject( int n, wxClientData* clientData );
|
||||
wxClientData* GetClientObject( int n );
|
||||
|
||||
wxClientData* GetClientObject( int n ) const;
|
||||
|
||||
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
|
||||
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }
|
||||
void SetClientData( void *data ) { wxControl::SetClientData( data ); }
|
||||
void *GetClientData() const { return wxControl::GetClientData(); }
|
||||
|
||||
|
||||
void Clear();
|
||||
void Delete( int n );
|
||||
|
||||
|
||||
int FindString( const wxString &item );
|
||||
int GetSelection() const;
|
||||
wxString GetString( int n ) const;
|
||||
@@ -110,14 +110,14 @@ public:
|
||||
void Remove( long from, long to );
|
||||
void SetSelection( long from, long to );
|
||||
void SetEditable( bool editable );
|
||||
|
||||
|
||||
// implementation
|
||||
|
||||
|
||||
virtual void SetFocus();
|
||||
|
||||
|
||||
void OnSize( wxSizeEvent &event );
|
||||
void OnChar( wxKeyEvent &event );
|
||||
|
||||
|
||||
bool m_alreadySent;
|
||||
wxList m_clientDataList;
|
||||
wxList m_clientObjectList;
|
||||
@@ -130,11 +130,11 @@ public:
|
||||
GtkWidget* GetConnectWidget();
|
||||
bool IsOwnGtkWindow( GdkWindow *window );
|
||||
void ApplyWidgetStyle();
|
||||
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
private:
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxComboBox)
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
Reference in New Issue
Block a user