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

Added background colour again

Browse Source 
Added wxTextCtrl methods
  Removed Imlib

  -> Recompile


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-10-27 15:04:35 +00:00
parent b926666447
commit a81258bee4
82 changed files with 720 additions and 13159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gtk1/listbox.cpp
View File

@@ -141,12 +141,10 @@ void wxListBox::Append( const wxString &item, char *clientData )
GtkWidget *list_item = gtk_list_item_new_with_label( item );
if (m_hasOwnStyle)
if (m_widgetStyle)
{
GtkBin *bin = GTK_BIN( list_item );
gtk_widget_set_style( bin->child,
gtk_style_ref(
gtk_widget_get_style( m_widget ) ) );
gtk_widget_set_style( list_item, m_widgetStyle );
gtk_widget_set_style( GTK_BIN( list_item )->child, m_widgetStyle );
}
gtk_signal_connect( GTK_OBJECT(list_item), "select",
@@ -473,9 +471,7 @@ void wxListBox::SetFont( const wxFont &font )
GList *child = m_list->children;
while (child)
{
gtk_widget_set_style( GTK_BIN(child->data)->child,
gtk_style_ref(
gtk_widget_get_style( m_widget ) ) );
gtk_widget_set_style( GTK_BIN(child->data)->child, m_widgetStyle );
child = child->next;
}
@@ -483,30 +479,24 @@ void wxListBox::SetFont( const wxFont &font )
void wxListBox::SetBackgroundColour( const wxColour &colour )
{
return;
wxCHECK_RET( m_list != NULL, "invalid listbox" );
wxControl::SetBackgroundColour( colour );
return;
if (!m_backgroundColour.Ok()) return;
gtk_widget_set_style( GTK_WIDGET(m_list),
gtk_style_ref(
gtk_widget_get_style( m_widget ) ) );
// gtk_widget_set_style( GTK_WIDGET(m_list), m_widgetStyle );
GdkWindow *window = GTK_WIDGET(m_list)->window;
m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
gdk_window_set_background( window, m_backgroundColour.GetColor() );
gdk_window_clear( window );
GList *child = m_list->children;
while (child)
{
gtk_widget_set_style( GTK_WIDGET(child->data),
gtk_style_ref(
gtk_widget_get_style( m_widget ) ) );
gtk_widget_set_style( GTK_BIN(child->data)->child,
gtk_style_ref(
gtk_widget_get_style( m_widget ) ) );
gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
// gtk_widget_set_style( GTK_BIN(child->data)->child, m_widgetStyle );
child = child->next;
}