fixes

[wxWidgets.git] / src / gtk1 / combobox.cpp

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 59f2f9821e63630665c6ac0512a35786b7691e74..38e40a9642c7df6903a181062e676560e9983c20 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -2,7 +2,7 @@
 // Name:        combobox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        combobox.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -78,12 +78,14 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
   
   for (int i = 0; i < n; i++)
   {
   
   for (int i = 0; i < n; i++)
   {

-    GtkWidget *list_item;
-    list_item = gtk_list_item_new_with_label( choices[i] ); 
+    GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] ); 

   
   

+    m_clientData.Append( (wxObject*)NULL );
+    

     gtk_container_add( GTK_CONTAINER(list), list_item );
     
     gtk_container_add( GTK_CONTAINER(list), list_item );
     

-    m_clientData.Append( (wxObject*)NULL );
+    gtk_widget_realize( list_item );
+    gtk_widget_realize( GTK_BIN(list_item)->child );

     
     gtk_widget_show( list_item );
     
     
     gtk_widget_show( list_item );
     


@@ -97,6 +99,13 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
   
   if (!value.IsNull()) SetValue( value );
     
   
   if (!value.IsNull()) SetValue( value );
     

+  gtk_widget_realize( GTK_COMBO(m_widget)->list );
+  gtk_widget_realize( GTK_COMBO(m_widget)->entry );
+  gtk_widget_realize( GTK_COMBO(m_widget)->button );
+  
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+

   Show( TRUE );
     
   return TRUE;
   Show( TRUE );
     
   return TRUE;


@@ -104,6 +113,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
 
 void wxComboBox::Clear(void)
 {
 
 void wxComboBox::Clear(void)
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   gtk_list_clear_items( GTK_LIST(list), 0, Number() );
   
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   gtk_list_clear_items( GTK_LIST(list), 0, Number() );
   


@@ -112,28 +123,20 @@ void wxComboBox::Clear(void)
 
 void wxComboBox::Append( const wxString &item )
 {
 
 void wxComboBox::Append( const wxString &item )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   Append( item, (char*)NULL );
 }
 
 void wxComboBox::Append( const wxString &item, char *clientData )
 {
   Append( item, (char*)NULL );
 }
 
 void wxComboBox::Append( const wxString &item, char *clientData )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GtkWidget *list_item = gtk_list_item_new_with_label( item ); 
   
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   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( m_widget ) ) ); 
-  }
-  
-  if (m_backgroundColour != wxNullColour)
-  {
-    GtkBin *bin = GTK_BIN( list_item );
-    SetBackgroundColourHelper( bin->child->window );
-  }
+  if (m_widgetStyle) ApplyWidgetStyle();

   
   gtk_signal_connect( GTK_OBJECT(list_item), "select", 
     GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
   
   gtk_signal_connect( GTK_OBJECT(list_item), "select", 
     GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );


@@ -147,6 +150,8 @@ void wxComboBox::Append( const wxString &item, char *clientData )
 
 void wxComboBox::Delete( int n )
 {
 
 void wxComboBox::Delete( int n )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
   
   GList *child = g_list_nth( listbox->children, n );
   GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
   
   GList *child = g_list_nth( listbox->children, n );


@@ -172,6 +177,8 @@ void wxComboBox::Delete( int n )
 
 int wxComboBox::FindString( const wxString &item )
 {
 
 int wxComboBox::FindString( const wxString &item )
 {

+  wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
+  

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = GTK_LIST(list)->children;
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = GTK_LIST(list)->children;


@@ -192,6 +199,8 @@ int wxComboBox::FindString( const wxString &item )
 
 char* wxComboBox::GetClientData( int n )
 {
 
 char* wxComboBox::GetClientData( int n )
 {

+  wxCHECK_MSG( m_widget != NULL, (char*)NULL, "invalid combobox" );
+  

   wxNode *node = m_clientData.Nth( n );
   if (node) return (char*)node->Data();
   
   wxNode *node = m_clientData.Nth( n );
   if (node) return (char*)node->Data();
   


@@ -202,6 +211,8 @@ char* wxComboBox::GetClientData( int n )
 
 void wxComboBox::SetClientData( int n, char * clientData )
 {
 
 void wxComboBox::SetClientData( int n, char * clientData )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   wxNode *node = m_clientData.Nth( n );
   if (node) node->SetData( (wxObject*) clientData );
   
   wxNode *node = m_clientData.Nth( n );
   if (node) node->SetData( (wxObject*) clientData );
   


@@ -210,6 +221,8 @@ void wxComboBox::SetClientData( int n, char * clientData )
 
 int wxComboBox::GetSelection(void) const
 {
 
 int wxComboBox::GetSelection(void) const
 {

+  wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
+  

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *selection = GTK_LIST(list)->selection;
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *selection = GTK_LIST(list)->selection;


@@ -232,6 +245,8 @@ int wxComboBox::GetSelection(void) const
 
 wxString wxComboBox::GetString( int n ) const
 {
 
 wxString wxComboBox::GetString( int n ) const
 {

+  wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
+  

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = g_list_nth( GTK_LIST(list)->children, n );
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = g_list_nth( GTK_LIST(list)->children, n );


@@ -249,6 +264,8 @@ wxString wxComboBox::GetString( int n ) const
 
 wxString wxComboBox::GetStringSelection(void) const
 {
 
 wxString wxComboBox::GetStringSelection(void) const
 {

+  wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
+  

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *selection = GTK_LIST(list)->selection;
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *selection = GTK_LIST(list)->selection;


@@ -266,6 +283,8 @@ wxString wxComboBox::GetStringSelection(void) const
 
 int wxComboBox::Number(void) const
 {
 
 int wxComboBox::Number(void) const
 {

+  wxCHECK_MSG( m_widget != NULL, 0, "invalid combobox" );
+  

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = GTK_LIST(list)->children;
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = GTK_LIST(list)->children;


@@ -276,12 +295,16 @@ int wxComboBox::Number(void) const
 
 void wxComboBox::SetSelection( int n )
 {
 
 void wxComboBox::SetSelection( int n )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   gtk_list_select_item( GTK_LIST(list), n );
 }
 
 void wxComboBox::SetStringSelection( const wxString &string )
 {
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   gtk_list_select_item( GTK_LIST(list), n );
 }
 
 void wxComboBox::SetStringSelection( const wxString &string )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   int res = FindString( string );
   if (res == -1) return;
   SetSelection( res );
   int res = FindString( string );
   if (res == -1) return;
   SetSelection( res );


@@ -296,6 +319,8 @@ wxString wxComboBox::GetValue(void) const
 
 void wxComboBox::SetValue( const wxString& value )
 {
 
 void wxComboBox::SetValue( const wxString& value )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   wxString tmp = "";
   if (!value.IsNull()) tmp = value;
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   wxString tmp = "";
   if (!value.IsNull()) tmp = value;


@@ -304,6 +329,8 @@ void wxComboBox::SetValue( const wxString& value )
 
 void wxComboBox::Copy(void)
 {
 
 void wxComboBox::Copy(void)
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 #if (GTK_MINOR_VERSION == 1)
   gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 #if (GTK_MINOR_VERSION == 1)
   gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );


@@ -314,6 +341,8 @@ void wxComboBox::Copy(void)
 
 void wxComboBox::Cut(void)
 {
 
 void wxComboBox::Cut(void)
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 #if (GTK_MINOR_VERSION == 1)
   gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 #if (GTK_MINOR_VERSION == 1)
   gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );


@@ -324,6 +353,8 @@ void wxComboBox::Cut(void)
 
 void wxComboBox::Paste(void)
 {
 
 void wxComboBox::Paste(void)
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 #if (GTK_MINOR_VERSION == 1)
   gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 #if (GTK_MINOR_VERSION == 1)
   gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );


@@ -334,6 +365,8 @@ void wxComboBox::Paste(void)
 
 void wxComboBox::SetInsertionPoint( long pos )
 {
 
 void wxComboBox::SetInsertionPoint( long pos )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   int tmp = (int) pos;
   gtk_entry_set_position( GTK_ENTRY(entry), tmp );
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   int tmp = (int) pos;
   gtk_entry_set_position( GTK_ENTRY(entry), tmp );


@@ -341,6 +374,8 @@ void wxComboBox::SetInsertionPoint( long pos )
 
 void wxComboBox::SetInsertionPointEnd(void)
 {
 
 void wxComboBox::SetInsertionPointEnd(void)
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   int pos = GTK_ENTRY(entry)->text_length;
   SetInsertionPoint( pos-1 );
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   int pos = GTK_ENTRY(entry)->text_length;
   SetInsertionPoint( pos-1 );


@@ -361,6 +396,8 @@ long wxComboBox::GetLastPosition(void) const
 
 void wxComboBox::Replace( long from, long to, const wxString& value )
 {
 
 void wxComboBox::Replace( long from, long to, const wxString& value )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
   if (value.IsNull()) return;
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
   if (value.IsNull()) return;


@@ -370,6 +407,8 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
 
 void wxComboBox::Remove(long from, long to)
 {
 
 void wxComboBox::Remove(long from, long to)
 {

+  wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+  

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
 }
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
 }


@@ -388,7 +427,7 @@ void wxComboBox::OnSize( wxSizeEvent &event )
 {
   wxControl::OnSize( event );
   
 {
   wxControl::OnSize( event );
   

-  int w = 22;
+  int w = 21;

   
   gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
   
   
   gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
   


@@ -396,25 +435,22 @@ void wxComboBox::OnSize( wxSizeEvent &event )
   gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
 }
 
   gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
 }
 

-void wxComboBox::SetFont( const wxFont &font )
+void wxComboBox::ApplyWidgetStyle()

 {
 {

-  wxWindow::SetFont( font );
-   
-  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-  
-  gtk_widget_set_style( entry,
-    gtk_style_ref(
-      gtk_widget_get_style( m_widget ) ) ); 
+  SetWidgetStyle();

   
   

-  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle );
+  gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle );
+  gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle );

   
   

-  GList *child = GTK_LIST(list)->children;
+  GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
+  GList *child = list->children;

   while (child)
   {
   while (child)
   {

-    GtkBin *bin = (GtkBin*) child->data;
-    gtk_widget_set_style( bin->child, 
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
+    gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
+  
+    GtkBin *bin = GTK_BIN(child->data);
+    gtk_widget_set_style( bin->child, m_widgetStyle );

         
     child = child->next;
   }
         
     child = child->next;
   }


@@ -430,19 +466,3 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
   return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
            (window == GTK_COMBO(m_widget)->button->window ) );
 }
   return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
            (window == GTK_COMBO(m_widget)->button->window ) );
 }

-
-void wxComboBox::SetBackgroundColour( const wxColour &colour )
-{
-  wxWindow::SetBackgroundColour( colour );
-  
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-  GList *child = GTK_LIST(list)->children;
-  while (child)
-  {
-    GtkBin *bin = (GtkBin*) child->data;
-    SetBackgroundColourHelper( bin->child->window );
-    child = child->next;
-  }
-}
-