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

[1231183] 'cleanup: mismatched indentation' and other cleanings.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-07-22 18:01:46 +00:00
parent bfd84575a2
commit 0a164d4c4e
18 changed files with 456 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/combobox.cpp
View File

@@ -349,9 +349,9 @@ int wxComboBox::DoAppend( const wxString &item )
const int count = GetCount();
if ( (int)m_clientDataList.GetCount() < count )
m_clientDataList.Append( (wxObject*) NULL );
m_clientDataList.Append( (wxObject*) NULL );
if ( (int)m_clientObjectList.GetCount() < count )
m_clientObjectList.Append( (wxObject*) NULL );
m_clientObjectList.Append( (wxObject*) NULL );
EnableEvents();
@@ -396,9 +396,9 @@ int wxComboBox::DoInsert( const wxString &item, int pos )
count = GetCount();
if ( (int)m_clientDataList.GetCount() < count )
m_clientDataList.Insert( pos, (wxObject*) NULL );
m_clientDataList.Insert( pos, (wxObject*) NULL );
if ( (int)m_clientObjectList.GetCount() < count )
m_clientObjectList.Insert( pos, (wxObject*) NULL );
m_clientObjectList.Insert( pos, (wxObject*) NULL );
EnableEvents();
@@ -532,7 +532,7 @@ void wxComboBox::SetString(int n, const wxString &text)
int wxComboBox::FindString( const wxString &item ) const
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
@@ -581,7 +581,7 @@ int wxComboBox::GetSelection() const
wxString wxComboBox::GetString( int n ) const
{
wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
@@ -607,7 +607,7 @@ wxString wxComboBox::GetString( int n ) const
wxString wxComboBox::GetStringSelection() const
{
wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
@@ -626,7 +626,7 @@ wxString wxComboBox::GetStringSelection() const
wxFAIL_MSG( wxT("wxComboBox: no selection") );
return wxT("");
return wxEmptyString;
}
int wxComboBox::GetCount() const
@@ -677,7 +677,7 @@ void wxComboBox::SetValue( const wxString& value )
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
wxString tmp = wxT("");
wxString tmp;
if (!value.IsNull()) tmp = value;
gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );
@@ -1042,4 +1042,3 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
}
#endif