// Name: combobox.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
/////////////////////////////////////////////////////////////////////////////
static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
- if (!combo->HasVMT()) return;
- if (g_blockEventsOnDrag) return;
+ if (!combo->HasVMT()) return;
+ if (g_blockEventsOnDrag) return;
- if (combo->m_alreadySent)
- {
- combo->m_alreadySent = FALSE;
- return;
- }
-
- combo->m_alreadySent = TRUE;
-
- wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
- event.SetInt( combo->GetSelection() );
- wxString tmp( combo->GetStringSelection() );
- event.SetString( WXSTRINGCAST(tmp) );
- event.SetEventObject(combo);
- combo->GetEventHandler()->ProcessEvent(event);
-}
-
-//-----------------------------------------------------------------------------
-// size
+ if (combo->m_alreadySent)
+ {
+ combo->m_alreadySent = FALSE;
+ return;
+ }
-/*
-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;
+ combo->m_alreadySent = TRUE;
- return FALSE;
+ wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
+ event.SetInt( combo->GetSelection() );
+ wxString tmp( combo->GetStringSelection() );
+ event.SetString( WXSTRINGCAST(tmp) );
+ event.SetEventObject(combo);
+ combo->GetEventHandler()->ProcessEvent(event);
}
-*/
//-----------------------------------------------------------------------------
// wxComboBox
IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
-bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
- const wxPoint& pos, const wxSize& size,
- int n, const wxString choices[],
- long style, const wxValidator& validator, const wxString& name )
+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[],
+ long style, const wxValidator& validator,
+ const wxString& name )
{
- m_alreadySent = FALSE;
- m_needParent = TRUE;
+ m_alreadySent = FALSE;
+ m_needParent = TRUE;
- PreCreation( parent, id, pos, size, style, name );
+ PreCreation( parent, id, pos, size, style, name );
- SetValidator( validator );
+ SetValidator( validator );
- m_widget = gtk_combo_new();
+ m_widget = gtk_combo_new();
- wxSize newSize = size;
- if (newSize.x == -1) newSize.x = 100;
- if (newSize.y == -1) newSize.y = 26;
- SetSize( newSize.x, newSize.y );
+ wxSize newSize = size;
+ if (newSize.x == -1) newSize.x = 100;
+ if (newSize.y == -1) newSize.y = 26;
+ SetSize( newSize.x, newSize.y );
- GtkWidget *list = GTK_COMBO(m_widget)->list;
+ GtkWidget *list = GTK_COMBO(m_widget)->list;
- for (int i = 0; i < n; i++)
- {
- GtkWidget *list_item;
- list_item = gtk_list_item_new_with_label( choices[i] );
+ for (int i = 0; i < n; i++)
+ {
+ GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] );
- gtk_container_add( GTK_CONTAINER(list), list_item );
+ m_clientDataList.Append( (wxObject*)NULL );
+ m_clientObjectList.Append( (wxObject*)NULL );
- m_clientData.Append( (wxObject*)NULL );
+ gtk_container_add( GTK_CONTAINER(list), list_item );
- gtk_widget_show( list_item );
+ gtk_widget_realize( list_item );
+ gtk_widget_realize( GTK_BIN(list_item)->child );
- gtk_signal_connect( GTK_OBJECT(list_item), "select",
- GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
- }
+ gtk_widget_show( list_item );
+
+ gtk_signal_connect( GTK_OBJECT(list_item), "select",
+ GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+ }
- PostCreation();
+ m_parent->AddChild( this );
-/*
- gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_combo_size_callback), (gpointer)this );
-*/
+ (m_parent->m_insertCallback)( m_parent, this );
+
+ PostCreation();
- if (!value.IsNull()) SetValue( value );
+ ConnectWidget( GTK_COMBO(m_widget)->button );
+
+ if (!value.IsNull()) SetValue( value );
- Show( TRUE );
+ 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;
+ return TRUE;
+}
+
+wxComboBox::~wxComboBox()
+{
+ wxNode *node = m_clientDataList.First();
+ while (node)
+ {
+ wxClientData *cd = (wxClientData*)node->Data();
+ if (cd) delete cd;
+ node = node->Next();
+ }
+ m_clientDataList.Clear();
}
-void wxComboBox::Clear(void)
+void wxComboBox::AppendCommon( const wxString &item )
{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
- gtk_list_clear_items( GTK_LIST(list), 0, Number() );
+ wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+
+ GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+ GtkWidget *list_item = gtk_list_item_new_with_label( item );
+
+ gtk_signal_connect( GTK_OBJECT(list_item), "select",
+ GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+
+ gtk_container_add( GTK_CONTAINER(list), list_item );
+
+ if (m_widgetStyle) ApplyWidgetStyle();
- m_clientData.Clear();
+ gtk_widget_show( list_item );
}
void wxComboBox::Append( const wxString &item )
{
- Append( item, (char*)NULL );
+ m_clientDataList.Append( (wxObject*) NULL );
+ m_clientObjectList.Append( (wxObject*) NULL );
+
+ AppendCommon( item );
}
-void wxComboBox::Append( const wxString &item, char *clientData )
+void wxComboBox::Append( const wxString &item, void *clientData )
{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
+ m_clientDataList.Append( (wxObject*) clientData );
+ m_clientObjectList.Append( (wxObject*)NULL );
- GtkWidget *list_item = gtk_list_item_new_with_label( item );
+ AppendCommon( item );
+}
+
+void wxComboBox::Append( const wxString &item, wxClientData *clientData )
+{
+ m_clientDataList.Append( (wxObject*) NULL );
+ m_clientObjectList.Append( (wxObject*) clientData );
- if (m_hasOwnStyle)
- {
- GtkBin *bin = GTK_BIN( list_item );
- gtk_widget_set_style( bin->child,
- gtk_style_ref(
- gtk_widget_get_style( m_widget ) ) );
- }
+ AppendCommon( item );
+}
+
+void wxComboBox::SetClientData( int n, void* clientData )
+{
+ wxCHECK_RET( m_widget != NULL, "invalid combobox" );
- gtk_signal_connect( GTK_OBJECT(list_item), "select",
- GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+ wxNode *node = m_clientDataList.Nth( n );
+ if (!node) return;
- m_clientData.Append( (wxObject*)clientData );
+ node->SetData( (wxObject*) clientData );
+}
+
+void* wxComboBox::GetClientData( int n )
+{
+ wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" );
- gtk_container_add( GTK_CONTAINER(list), list_item );
+ wxNode *node = m_clientDataList.Nth( n );
+ if (!node) return NULL;
- gtk_widget_show( list_item );
+ return node->Data();
}
-void wxComboBox::Delete( int n )
+void wxComboBox::SetClientObject( int n, wxClientData* clientData )
{
- 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 );
+ wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+
+ wxNode *node = m_clientObjectList.Nth( n );
+ if (!node) return;
- wxNode *node = m_clientData.Nth( n );
- if (!node)
- {
- wxFAIL_MSG( "wrong index" );
- }
- else
- m_clientData.DeleteNode( node );
+ wxClientData *cd = (wxClientData*) node->Data();
+ if (cd) delete cd;
+
+ node->SetData( (wxObject*) clientData );
}
-int wxComboBox::FindString( const wxString &item )
+wxClientData* wxComboBox::GetClientObject( int n )
{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
+ wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" );
- GList *child = GTK_LIST(list)->children;
- int count = 0;
- while (child)
- {
- GtkBin *bin = GTK_BIN( child->data );
- GtkLabel *label = GTK_LABEL( bin->child );
- if (item == label->label) return count;
- count++;
- child = child->next;
- }
-
- wxFAIL_MSG( "wxComboBox: string not found" );
-
- return -1;
+ wxNode *node = m_clientDataList.Nth( n );
+ if (!node) return (wxClientData*) NULL;
+
+ return (wxClientData*) node->Data();
}
-char* wxComboBox::GetClientData( int n )
+void wxComboBox::Clear()
{
- wxNode *node = m_clientData.Nth( n );
- if (node) return (char*)node->Data();
+ wxCHECK_RET( m_widget != NULL, "invalid combobox" );
- wxFAIL_MSG( "wxComboBox: wrong index" );
+ GtkWidget *list = GTK_COMBO(m_widget)->list;
+ gtk_list_clear_items( GTK_LIST(list), 0, Number() );
- return (char *) NULL;
+ wxNode *node = m_clientObjectList.First();
+ while (node)
+ {
+ wxClientData *cd = (wxClientData*)node->Data();
+ if (cd) delete cd;
+ node = node->Next();
+ }
+ m_clientObjectList.Clear();
+
+ m_clientDataList.Clear();
}
-void wxComboBox::SetClientData( int n, char * clientData )
+void wxComboBox::Delete( int n )
{
- wxNode *node = m_clientData.Nth( n );
- if (node) node->SetData( (wxObject*) clientData );
+ wxCHECK_RET( m_widget != NULL, "invalid combobox" );
- wxFAIL_MSG( "wxComboBox: wrong index" );
+ 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_clientObjectList.Nth( n );
+ if (node)
+ {
+ wxClientData *cd = (wxClientData*)node->Data();
+ if (cd) delete cd;
+ m_clientObjectList.DeleteNode( node );
+ }
+
+ node = m_clientDataList.Nth( n );
+ if (node)
+ {
+ m_clientDataList.DeleteNode( node );
+ }
}
-int wxComboBox::GetSelection(void) const
+int wxComboBox::FindString( const wxString &item )
{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
+ wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
+
+ GtkWidget *list = GTK_COMBO(m_widget)->list;
- GList *selection = GTK_LIST(list)->selection;
- if (selection)
- {
GList *child = GTK_LIST(list)->children;
int count = 0;
while (child)
{
- if (child->data == selection->data) return count;
- count++;
- child = child->next;
+ GtkBin *bin = GTK_BIN( child->data );
+ GtkLabel *label = GTK_LABEL( bin->child );
+ if (item == label->label) return count;
+ count++;
+ child = child->next;
}
- }
- wxFAIL_MSG( "wxComboBox: no selection" );
+ wxFAIL_MSG( "wxComboBox: string not found" );
- return -1;
+ return -1;
+}
+
+int wxComboBox::GetSelection() const
+{
+ wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
+
+ GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+ GList *selection = GTK_LIST(list)->selection;
+ if (selection)
+ {
+ GList *child = GTK_LIST(list)->children;
+ int count = 0;
+ while (child)
+ {
+ if (child->data == selection->data) return count;
+ count++;
+ child = child->next;
+ }
+ }
+
+ wxFAIL_MSG( "wxComboBox: no selection" );
+
+ return -1;
}
wxString wxComboBox::GetString( int n ) const
{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
+ wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
- GList *child = g_list_nth( GTK_LIST(list)->children, n );
- if (child)
- {
- GtkBin *bin = GTK_BIN( child->data );
- GtkLabel *label = GTK_LABEL( bin->child );
- return label->label;
- }
+ GtkWidget *list = GTK_COMBO(m_widget)->list;
- wxFAIL_MSG( "wxComboBox: wrong index" );
+ GList *child = g_list_nth( GTK_LIST(list)->children, n );
+ if (child)
+ {
+ GtkBin *bin = GTK_BIN( child->data );
+ GtkLabel *label = GTK_LABEL( bin->child );
+ return label->label;
+ }
- return "";
+ wxFAIL_MSG( "wxComboBox: wrong index" );
+
+ return "";
}
-wxString wxComboBox::GetStringSelection(void) const
+wxString wxComboBox::GetStringSelection() const
{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
+ wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
- GList *selection = GTK_LIST(list)->selection;
- if (selection)
- {
- GtkBin *bin = GTK_BIN( selection->data );
- wxString tmp = GTK_LABEL( bin->child )->label;
- return tmp;
- }
+ GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+ GList *selection = GTK_LIST(list)->selection;
+ if (selection)
+ {
+ GtkBin *bin = GTK_BIN( selection->data );
+ wxString tmp = GTK_LABEL( bin->child )->label;
+ return tmp;
+ }
- wxFAIL_MSG( "wxComboBox: no selection" );
+ wxFAIL_MSG( "wxComboBox: no selection" );
- return "";
+ return "";
}
-int wxComboBox::Number(void) const
+int wxComboBox::Number() const
{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
+ wxCHECK_MSG( m_widget != NULL, 0, "invalid combobox" );
- GList *child = GTK_LIST(list)->children;
- int count = 0;
- while (child) { count++; child = child->next; }
- return count;
+ GtkWidget *list = GTK_COMBO(m_widget)->list;
+
+ GList *child = GTK_LIST(list)->children;
+ int count = 0;
+ while (child) { count++; child = child->next; }
+ return count;
}
void wxComboBox::SetSelection( int n )
{
- GtkWidget *list = GTK_COMBO(m_widget)->list;
- gtk_list_select_item( GTK_LIST(list), 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 )
{
- int res = FindString( string );
- if (res == -1) return;
- SetSelection( res );
+ wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+
+ int res = FindString( string );
+ if (res == -1) return;
+ SetSelection( res );
}
-wxString wxComboBox::GetValue(void) const
+wxString wxComboBox::GetValue() const
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) );
- return tmp;
+ GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+ wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) );
+ return tmp;
}
void wxComboBox::SetValue( const wxString& value )
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- wxString tmp = "";
- if (!value.IsNull()) tmp = value;
- gtk_entry_set_text( GTK_ENTRY(entry), tmp );
+ wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+
+ GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+ wxString tmp = "";
+ if (!value.IsNull()) tmp = value;
+ gtk_entry_set_text( GTK_ENTRY(entry), tmp );
}
-void wxComboBox::Copy(void)
+void wxComboBox::Copy()
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
+ 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) );
+#else
+ gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
+#endif
}
-void wxComboBox::Cut(void)
+void wxComboBox::Cut()
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
+ 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) );
+#else
+ gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
+#endif
}
-void wxComboBox::Paste(void)
+void wxComboBox::Paste()
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
+ 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) );
+#else
+ gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
+#endif
}
void wxComboBox::SetInsertionPoint( long pos )
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- int tmp = (int) pos;
- gtk_entry_set_position( GTK_ENTRY(entry), tmp );
+ 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 );
}
-void wxComboBox::SetInsertionPointEnd(void)
+void wxComboBox::SetInsertionPointEnd()
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- int pos = GTK_ENTRY(entry)->text_length;
- SetInsertionPoint( pos-1 );
+ wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+
+ GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+ int pos = GTK_ENTRY(entry)->text_length;
+ SetInsertionPoint( pos-1 );
}
-long wxComboBox::GetInsertionPoint(void) const
+long wxComboBox::GetInsertionPoint() const
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- return (long) GTK_EDITABLE(entry)->current_pos;
+ GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+ return (long) GTK_EDITABLE(entry)->current_pos;
}
-long wxComboBox::GetLastPosition(void) const
+long wxComboBox::GetLastPosition() const
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- int pos = GTK_ENTRY(entry)->text_length;
- return (long) pos-1;
+ GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+ int pos = GTK_ENTRY(entry)->text_length;
+ return (long) pos-1;
}
void wxComboBox::Replace( long from, long to, const wxString& value )
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
- if (value.IsNull()) return;
- gint pos = (gint)to;
- gtk_editable_insert_text( GTK_EDITABLE(entry), value, value.Length(), &pos );
+ 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;
+ gint pos = (gint)to;
+ gtk_editable_insert_text( GTK_EDITABLE(entry), value, value.Length(), &pos );
}
void wxComboBox::Remove(long from, long to)
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)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 );
}
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 = 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 );
}
-void wxComboBox::SetFont( const wxFont &font )
+void wxComboBox::ApplyWidgetStyle()
{
- wxWindow::SetFont( font );
-
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+ SetWidgetStyle();
- gtk_widget_set_style( entry,
- gtk_style_ref(
- gtk_widget_get_style( m_widget ) ) );
+ 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 );
- GtkWidget *list = GTK_COMBO(m_widget)->list;
+ GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
+ GList *child = list->children;
+ while (child)
+ {
+ gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
- 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 ) ) );
+ GtkBin *bin = GTK_BIN(child->data);
+ gtk_widget_set_style( bin->child, m_widgetStyle );
- child = child->next;
- }
+ child = child->next;
+ }
}
-
-GtkWidget* wxComboBox::GetConnectWidget(void)
+
+GtkWidget* wxComboBox::GetConnectWidget()
{
- return GTK_COMBO(m_widget)->entry;
+ 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 ) );
+}
projects / wxWidgets.git / blobdiff