X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc54776e31f04962739980d6cdcc894bb87a9c53..9905086c2d34b14bb46275f5c64e0ad2b283e143:/src/gtk1/listbox.cpp

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 7742d96c55..bca38181d5 100644
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -2,9 +2,8 @@
 // Name:        listbox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -115,6 +114,8 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
       gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
         GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
+    ConnectWidget( list_item );	
+	
     m_clientData.Append( (wxObject*)NULL );
 
     gtk_widget_show( list_item );
@@ -124,6 +125,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
   gtk_widget_realize( GTK_WIDGET(m_list) );
 
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+
   Show( TRUE );
 
   return TRUE;
@@ -136,22 +140,10 @@ void wxListBox::Append( const wxString &item )
 
 void wxListBox::Append( const wxString &item, char *clientData )
 {
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
 
   GtkWidget *list_item = gtk_list_item_new_with_label( item );
 
-  if (m_hasOwnStyle)
-  {
-    GtkBin *bin = GTK_BIN( list_item );
-    gtk_widget_set_style( bin->child,
-      gtk_style_ref(
-        gtk_widget_get_style( GTK_WIDGET(m_list) ) ) );
-	
-    gtk_widget_set_style( GTK_WIDGET(bin),
-      gtk_style_ref(
-        gtk_widget_get_style( GTK_WIDGET(m_list) ) ) );
-  }
-  
   gtk_signal_connect( GTK_OBJECT(list_item), "select",
     GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
@@ -159,10 +151,14 @@ void wxListBox::Append( const wxString &item, char *clientData )
     gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
+  ConnectWidget( list_item );	
+	
   m_clientData.Append( (wxObject*)clientData );
 
   gtk_container_add( GTK_CONTAINER(m_list), list_item );
 
+  if (m_widgetStyle) ApplyWidgetStyle();
+  
   gtk_widget_show( list_item );
 
   ConnectWidget( list_item );
@@ -172,7 +168,7 @@ void wxListBox::Append( const wxString &item, char *clientData )
 
 void wxListBox::Clear(void)
 {
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
 
   gtk_list_clear_items( m_list, 0, Number() );
 
@@ -181,7 +177,7 @@ void wxListBox::Clear(void)
 
 void wxListBox::Delete( int n )
 {
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
 
   GList *child = g_list_nth( m_list->children, n );
 
@@ -206,14 +202,14 @@ void wxListBox::Delete( int n )
 
 void wxListBox::Deselect( int n )
 {
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
 
   gtk_list_unselect_item( m_list, n );
 }
 
 int wxListBox::FindString( const wxString &item ) const
 {
-  wxCHECK_MSG( m_list != NULL, -1, "invalid list ctrl" );
+  wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
   
   GList *child = m_list->children;
   int count = 0;
@@ -235,7 +231,7 @@ int wxListBox::FindString( const wxString &item ) const
 
 char *wxListBox::GetClientData( int n ) const
 {
-  wxCHECK_MSG( m_list != NULL, (char*) NULL, "invalid list ctrl" );
+  wxCHECK_MSG( m_list != NULL, (char*) NULL, "invalid listbox" );
   
   wxNode *node = m_clientData.Nth( n );
   if (node) return ((char*)node->Data());
@@ -246,7 +242,7 @@ char *wxListBox::GetClientData( int n ) const
 
 int wxListBox::GetSelection(void) const
 {
-  wxCHECK_MSG( m_list != NULL, -1, "invalid list ctrl" );
+  wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
   
   GList *child = m_list->children;
   int count = 0;
@@ -261,7 +257,7 @@ int wxListBox::GetSelection(void) const
 
 int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
-  wxCHECK_MSG( m_list != NULL, -1, "invalid list ctrl" );
+  wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
   
   // get the number of selected items first
   GList *child = m_list->children;
@@ -290,7 +286,7 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
 
 wxString wxListBox::GetString( int n ) const
 {
-  wxCHECK_MSG( m_list != NULL, "", "invalid list ctrl" );
+  wxCHECK_MSG( m_list != NULL, "", "invalid listbox" );
   
   GList *child = g_list_nth( m_list->children, n );
   if (child)
@@ -305,7 +301,7 @@ wxString wxListBox::GetString( int n ) const
 
 wxString wxListBox::GetStringSelection(void) const
 {
-  wxCHECK_MSG( m_list != NULL, "", "invalid list ctrl" );
+  wxCHECK_MSG( m_list != NULL, "", "invalid listbox" );
   
   GList *selection = m_list->selection;
   if (selection)
@@ -320,7 +316,7 @@ wxString wxListBox::GetStringSelection(void) const
 
 int wxListBox::Number(void)
 {
-  wxCHECK_MSG( m_list != NULL, -1, "invalid list ctrl" );
+  wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
   
   GList *child = m_list->children;
   int count = 0;
@@ -330,7 +326,7 @@ int wxListBox::Number(void)
 
 bool wxListBox::Selected( int n )
 {
-  wxCHECK_MSG( m_list != NULL, FALSE, "invalid list ctrl" );
+  wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" );
   
   GList *target = g_list_nth( m_list->children, n );
   if (target)
@@ -353,7 +349,7 @@ void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
 
 void wxListBox::SetClientData( int n, char *clientData )
 {
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
   
   wxNode *node = m_clientData.Nth( n );
   if (node)
@@ -378,7 +374,7 @@ void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
 
 void wxListBox::SetSelection( int n, bool select )
 {
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
   
   if (select)
     gtk_list_select_item( m_list, n );
@@ -388,7 +384,7 @@ void wxListBox::SetSelection( int n, bool select )
 
 void wxListBox::SetString( int n, const wxString &string )
 {
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
   
   GList *child = g_list_nth( m_list->children, n );
   if (child)
@@ -405,7 +401,7 @@ void wxListBox::SetString( int n, const wxString &string )
 
 void wxListBox::SetStringSelection( const wxString &string, bool select )
 {
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
   
   SetSelection( FindString(string), select );
 }
@@ -428,7 +424,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
 
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
+  wxCHECK_RET( m_list != NULL, "invalid listbox" );
   
   GList *child = m_list->children;
   while (child)
@@ -452,43 +448,6 @@ GtkWidget *wxListBox::GetConnectWidget(void)
   return GTK_WIDGET(m_list);
 }
 
-void wxListBox::SetFont( const wxFont &font )
-{
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
-  
-  if (((wxFont*)&font)->Ok())
-    m_font = font;
-  else
-    m_font = *wxSWISS_FONT;
-
-  GtkStyle *style = (GtkStyle*) NULL;
-  if (!m_hasOwnStyle)
-  {
-    m_hasOwnStyle = TRUE;
-    style = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(m_list) ) );
-  }
-  else
-  {
-    style = gtk_widget_get_style( GTK_WIDGET(m_list) );
-  }
-
-  gdk_font_unref( style->font );
-  style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
-
-  gtk_widget_set_style( GTK_WIDGET(m_list), style );
-  
-
-  GList *child = m_list->children;
-  while (child)
-  {
-    GtkBin *bin = (GtkBin*) child->data;
-    gtk_widget_set_style( bin->child,
-      gtk_style_ref(
-        gtk_widget_get_style( GTK_WIDGET(m_list) ) ) );
-    child = child->next;
-  }
-}
-
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
   if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
@@ -496,47 +455,28 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
   GList *child = m_list->children;
   while (child)
   {
-    GtkBin *bin = GTK_BIN( child->data );
-    if (bin->child->window == window) return TRUE;
+    GtkWidget *bin = GTK_WIDGET( child->data );
+    if (bin->window == window) return TRUE;
     child = child->next;
   }
 
   return FALSE;
 }
 
-void wxListBox::SetBackgroundColour( const wxColour &colour )
+void wxListBox::ApplyWidgetStyle()
 {
-  wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
-
-  m_backgroundColour = colour;
-  if (!m_backgroundColour.Ok()) return;
+  SetWidgetStyle();
   
-  SetBackgroundColourHelper( GTK_WIDGET(m_list)->window );
-
-  GtkStyle *style = (GtkStyle*) NULL;
-  if (!m_hasOwnStyle)
-  {
-    m_hasOwnStyle = TRUE;
-    style = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(m_list) ) );
-  }
-  else
-  {
-    style = gtk_widget_get_style( GTK_WIDGET(m_list) );
-  }
-
-  style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
-  style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
-
-  gtk_widget_set_style( GTK_WIDGET(m_list), style );
-
+  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)
   {
-    GtkWidget *item = GTK_WIDGET(child->data);
-    gtk_widget_set_style( item,
-      gtk_style_ref(
-        gtk_widget_get_style( GTK_WIDGET(m_list) ) ) );
+    gtk_widget_set_style( GTK_BIN(child->data)->child, m_widgetStyle );
+    gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
     child = child->next;
   }
 }
-