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

added InvalidateBestSize calls when combobox's content changes; DoGetBestSize now accounts for the width returned by GTK+ too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-10-23 16:06:11 +00:00
parent 377a8f52cf
commit b0021947ef
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gtk/combobox.cpp
View File

@@ -262,6 +262,8 @@ int wxComboBox::DoAppend( const wxString &item )
EnableEvents(); EnableEvents();
InvalidateBestSize();
return count - 1; return count - 1;
} }
@@ -306,6 +308,8 @@ int wxComboBox::DoInsert( const wxString &item, int pos )
m_clientObjectList.Insert( pos, (wxObject*) NULL ); m_clientObjectList.Insert( pos, (wxObject*) NULL );
EnableEvents(); EnableEvents();
InvalidateBestSize();
return pos; return pos;
} }
@@ -371,6 +375,8 @@ void wxComboBox::Clear()
m_clientDataList.Clear(); m_clientDataList.Clear();
EnableEvents(); EnableEvents();
InvalidateBestSize();
} }
void wxComboBox::Delete( int n ) void wxComboBox::Delete( int n )
@@ -406,6 +412,8 @@ void wxComboBox::Delete( int n )
m_clientDataList.Erase( node ); m_clientDataList.Erase( node );
EnableEvents(); EnableEvents();
InvalidateBestSize();
} }
void wxComboBox::SetString(int n, const wxString &text) void wxComboBox::SetString(int n, const wxString &text)
@@ -425,6 +433,8 @@ void wxComboBox::SetString(int n, const wxString &text)
{ {
wxFAIL_MSG( wxT("wxComboBox: wrong index") ); wxFAIL_MSG( wxT("wxComboBox: wrong index") );
} }
InvalidateBestSize();
} }
int wxComboBox::FindString( const wxString &item ) const int wxComboBox::FindString( const wxString &item ) const
@@ -587,6 +597,8 @@ void wxComboBox::SetValue( const wxString& value )
wxString tmp = wxT(""); wxString tmp = wxT("");
if (!value.IsNull()) tmp = value; if (!value.IsNull()) tmp = value;
gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) ); gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );
InvalidateBestSize();
} }
void wxComboBox::Copy() void wxComboBox::Copy()
@@ -720,14 +732,6 @@ void wxComboBox::EnableEvents()
void wxComboBox::OnSize( wxSizeEvent &event ) void wxComboBox::OnSize( wxSizeEvent &event )
{ {
event.Skip(); event.Skip();
#if 0
int w = 21;
gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
#endif // 0
} }
void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style) void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style)
@@ -767,7 +771,6 @@ wxSize wxComboBox::DoGetBestSize() const
// we know better our horizontal extent: it depends on the longest string // we know better our horizontal extent: it depends on the longest string
// in the combobox // in the combobox
ret.x = 0;
if ( m_widget ) if ( m_widget )
{ {
int width; int width;

21
src/gtk1/combobox.cpp
View File

@@ -262,6 +262,8 @@ int wxComboBox::DoAppend( const wxString &item )
EnableEvents(); EnableEvents();
InvalidateBestSize();
return count - 1; return count - 1;
} }
@@ -306,6 +308,8 @@ int wxComboBox::DoInsert( const wxString &item, int pos )
m_clientObjectList.Insert( pos, (wxObject*) NULL ); m_clientObjectList.Insert( pos, (wxObject*) NULL );
EnableEvents(); EnableEvents();
InvalidateBestSize();
return pos; return pos;
} }
@@ -371,6 +375,8 @@ void wxComboBox::Clear()
m_clientDataList.Clear(); m_clientDataList.Clear();
EnableEvents(); EnableEvents();
InvalidateBestSize();
} }
void wxComboBox::Delete( int n ) void wxComboBox::Delete( int n )
@@ -406,6 +412,8 @@ void wxComboBox::Delete( int n )
m_clientDataList.Erase( node ); m_clientDataList.Erase( node );
EnableEvents(); EnableEvents();
InvalidateBestSize();
} }
void wxComboBox::SetString(int n, const wxString &text) void wxComboBox::SetString(int n, const wxString &text)
@@ -425,6 +433,8 @@ void wxComboBox::SetString(int n, const wxString &text)
{ {
wxFAIL_MSG( wxT("wxComboBox: wrong index") ); wxFAIL_MSG( wxT("wxComboBox: wrong index") );
} }
InvalidateBestSize();
} }
int wxComboBox::FindString( const wxString &item ) const int wxComboBox::FindString( const wxString &item ) const
@@ -587,6 +597,8 @@ void wxComboBox::SetValue( const wxString& value )
wxString tmp = wxT(""); wxString tmp = wxT("");
if (!value.IsNull()) tmp = value; if (!value.IsNull()) tmp = value;
gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) ); gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );
InvalidateBestSize();
} }
void wxComboBox::Copy() void wxComboBox::Copy()
@@ -720,14 +732,6 @@ void wxComboBox::EnableEvents()
void wxComboBox::OnSize( wxSizeEvent &event ) void wxComboBox::OnSize( wxSizeEvent &event )
{ {
event.Skip(); event.Skip();
#if 0
int w = 21;
gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
#endif // 0
} }
void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style) void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style)
@@ -767,7 +771,6 @@ wxSize wxComboBox::DoGetBestSize() const
// we know better our horizontal extent: it depends on the longest string // we know better our horizontal extent: it depends on the longest string
// in the combobox // in the combobox
ret.x = 0;
if ( m_widget ) if ( m_widget )
{ {
int width; int width;