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

GetClientData(int n) should be const (part of patch 649438)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-09 21:55:04 +00:00
parent 997176a346
commit 30ed6e5c89
4 changed files with 70 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/combobox.h
View File

@@ -74,9 +74,9 @@ public:
void Insert( const wxString &item, int pos, wxClientData* clientData ); void Insert( const wxString &item, int pos, wxClientData* clientData );
void SetClientData( int n, void* clientData ); void SetClientData( int n, void* clientData );
void* GetClientData( int n ); void* GetClientData( int n ) const;
void SetClientObject( int n, wxClientData* clientData ); void SetClientObject( int n, wxClientData* clientData );
wxClientData* GetClientObject( int n ); wxClientData* GetClientObject( int n ) const;
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); } void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); } wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }

4
include/wx/gtk1/combobox.h
View File

@@ -74,9 +74,9 @@ public:
void Insert( const wxString &item, int pos, wxClientData* clientData ); void Insert( const wxString &item, int pos, wxClientData* clientData );
void SetClientData( int n, void* clientData ); void SetClientData( int n, void* clientData );
void* GetClientData( int n ); void* GetClientData( int n ) const;
void SetClientObject( int n, wxClientData* clientData ); void SetClientObject( int n, wxClientData* clientData );
wxClientData* GetClientObject( int n ); wxClientData* GetClientObject( int n ) const;
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); } void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); } wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }

10
src/gtk/combobox.cpp
View File

@@ -366,14 +366,13 @@ void wxComboBox::SetClientData( int n, void* clientData )
node->SetData( (wxObject*) clientData ); node->SetData( (wxObject*) clientData );
} }
void* wxComboBox::GetClientData( int n ) void* wxComboBox::GetClientData( int n ) const
{ {
wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
wxNode *node = m_clientDataList.Item( n ); wxNode *node = m_clientDataList.Item( n );
if (!node) return NULL;
return node->GetData(); return node ? node->GetData() : NULL;
} }
void wxComboBox::SetClientObject( int n, wxClientData* clientData ) void wxComboBox::SetClientObject( int n, wxClientData* clientData )
@@ -389,14 +388,13 @@ void wxComboBox::SetClientObject( int n, wxClientData* clientData )
node->SetData( (wxObject*) clientData ); node->SetData( (wxObject*) clientData );
} }
wxClientData* wxComboBox::GetClientObject( int n ) wxClientData* wxComboBox::GetClientObject( int n ) const
{ {
wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") ); wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
wxNode *node = m_clientObjectList.Item( n ); wxNode *node = m_clientObjectList.Item( n );
if (!node) return (wxClientData*) NULL;
return (wxClientData*) node->GetData(); return node ? (wxClientData*) node->GetData() : NULL;
} }
void wxComboBox::Clear() void wxComboBox::Clear()

10
src/gtk1/combobox.cpp
View File

@@ -366,14 +366,13 @@ void wxComboBox::SetClientData( int n, void* clientData )
node->SetData( (wxObject*) clientData ); node->SetData( (wxObject*) clientData );
} }
void* wxComboBox::GetClientData( int n ) void* wxComboBox::GetClientData( int n ) const
{ {
wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
wxNode *node = m_clientDataList.Item( n ); wxNode *node = m_clientDataList.Item( n );
if (!node) return NULL;
return node->GetData(); return node ? node->GetData() : NULL;
} }
void wxComboBox::SetClientObject( int n, wxClientData* clientData ) void wxComboBox::SetClientObject( int n, wxClientData* clientData )
@@ -389,14 +388,13 @@ void wxComboBox::SetClientObject( int n, wxClientData* clientData )
node->SetData( (wxObject*) clientData ); node->SetData( (wxObject*) clientData );
} }
wxClientData* wxComboBox::GetClientObject( int n ) wxClientData* wxComboBox::GetClientObject( int n ) const
{ {
wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") ); wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
wxNode *node = m_clientObjectList.Item( n ); wxNode *node = m_clientObjectList.Item( n );
if (!node) return (wxClientData*) NULL;
return (wxClientData*) node->GetData(); return node ? (wxClientData*) node->GetData() : NULL;
} }
void wxComboBox::Clear() void wxComboBox::Clear()