X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..520e470fdd0daef09c77938db642e4583933c90d:/src/gtk/combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 4bcce99f9f..9db6be50b8 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -22,11 +22,8 @@
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
-// wxComboBox
-//-----------------------------------------------------------------------------
-
+// "select"
 //-----------------------------------------------------------------------------
-// clicked
 
 static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
@@ -50,26 +47,15 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
 }
 
 //-----------------------------------------------------------------------------
-// size 
-
-/*
-static gint gtk_combo_size_callback( GtkCombo *widget, GtkAllocation* alloc, wxComboBox *win )
-{ 
-  if (!win->HasVMT()) return FALSE;
-  if (g_blockEventsOnDrag) return FALSE;
-  if (!widget->button) return FALSE;
-  
-  widget->button->allocation.x = 
-    alloc->width - widget->button->allocation.width;
-  
-  return FALSE;
-}
-*/
-
+// wxComboBox
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
 
+BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+  EVT_SIZE(wxComboBox::OnSize)
+END_EVENT_TABLE()
+
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
   const wxPoint& pos, const wxSize& size,
   int n, const wxString choices[],
@@ -108,11 +94,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
   
   PostCreation();
 
-/*
-  gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", 
-    GTK_SIGNAL_FUNC(gtk_combo_size_callback), (gpointer)this );
-*/
-
+  ConnectWidget( GTK_COMBO(m_widget)->button );
+  
   if (!value.IsNull()) SetValue( value );
     
   Show( TRUE );
@@ -137,28 +120,46 @@ void wxComboBox::Append( const wxString &item, char *clientData )
 {
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
-  GtkWidget *list_item;
-  list_item = gtk_list_item_new_with_label( item ); 
+  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 ) ) ); 
+  }
   
   gtk_signal_connect( GTK_OBJECT(list_item), "select", 
     GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
   
+  m_clientData.Append( (wxObject*)clientData );
+  
   gtk_container_add( GTK_CONTAINER(list), list_item );
     
   gtk_widget_show( list_item );
-  
-  m_clientData.Append( (wxObject*)clientData );
 }
 
 void wxComboBox::Delete( int n )
 {
-  GtkWidget *list = GTK_COMBO(m_widget)->list;
-  gtk_list_clear_items( GTK_LIST(list), n, n );
+  GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
+  
+  GList *child = g_list_nth( listbox->children, n );
+  
+  if (!child)
+  {
+    wxFAIL_MSG("wrong index");
+    return;
+  }
+  
+  GList *list = g_list_append( NULL, child->data );
+  gtk_list_remove_items( listbox, list );
+  g_list_free( list );
   
   wxNode *node = m_clientData.Nth( n );
   if (!node)
   {
-    wxFAIL_MSG( "wxComboBox: wrong index" );
+    wxFAIL_MSG( "wrong index" );
   }
   else
     m_clientData.DeleteNode( node );
@@ -299,19 +300,31 @@ void wxComboBox::SetValue( const wxString& value )
 void wxComboBox::Copy(void)
 {
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+#if (GTK_MINOR_VERSION == 1)
+  gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
+#else
   gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
+#endif
 }
 
 void wxComboBox::Cut(void)
 {
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+#if (GTK_MINOR_VERSION == 1)
+  gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
+#else
   gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
+#endif
 }
 
 void wxComboBox::Paste(void)
 {
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+#if (GTK_MINOR_VERSION == 1)
+  gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
+#else
   gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
+#endif
 }
 
 void wxComboBox::SetInsertionPoint( long pos )
@@ -358,10 +371,58 @@ void wxComboBox::Remove(long from, long to)
 
 void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
 {
+  wxFAIL_MSG( "wxComboBox::SetSelection not implemented" );
 }
 
 void wxComboBox::SetEditable( bool WXUNUSED(editable) )
 {
+  wxFAIL_MSG( "wxComboBox::SetEditable not implemented" );
+}
+
+void wxComboBox::OnSize( wxSizeEvent &event )
+{
+  wxControl::OnSize( event );
+  
+  int w = 22;
+  
+  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 );
+}
+
+void wxComboBox::SetFont( const wxFont &font )
+{
+  wxWindow::SetFont( font );
+   
+  GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+  
+  gtk_widget_set_style( entry,
+    gtk_style_ref(
+      gtk_widget_get_style( m_widget ) ) ); 
+  
+  GtkWidget *list = GTK_COMBO(m_widget)->list;
+  
+  GList *child = GTK_LIST(list)->children;
+  while (child)
+  {
+    GtkBin *bin = (GtkBin*) child->data;
+    gtk_widget_set_style( bin->child, 
+      gtk_style_ref(
+        gtk_widget_get_style( m_widget ) ) ); 
+        
+    child = child->next;
+  }
+}
+
+GtkWidget* wxComboBox::GetConnectWidget(void)
+{
+  return GTK_COMBO(m_widget)->entry;
+}
+
+bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
+{
+  return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
+           (window == GTK_COMBO(m_widget)->button->window ) );
 }
 
-