X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66bd6b93005b803910caca469110495ce549599f..32e9da8bfaafe4f462f7473a7e11e3387847e121:/src/gtk1/combobox.cpp diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index 1ac91ffdd4..59f2f9821e 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/combobox.cpp @@ -2,9 +2,8 @@ // 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 ///////////////////////////////////////////////////////////////////////////// @@ -13,6 +12,7 @@ #endif #include "wx/combobox.h" +#include //----------------------------------------------------------------------------- // data @@ -21,11 +21,8 @@ extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- -// wxComboBox -//----------------------------------------------------------------------------- - +// "select" //----------------------------------------------------------------------------- -// clicked static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) { @@ -46,39 +43,30 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox event.SetString( WXSTRINGCAST(tmp) ); event.SetEventObject(combo); combo->GetEventHandler()->ProcessEvent(event); -}; +} //----------------------------------------------------------------------------- -// 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[], - long style, const wxString& name ) + long style, const wxValidator& validator, const wxString& name ) { m_alreadySent = FALSE; m_needParent = TRUE; PreCreation( parent, id, pos, size, style, name ); + SetValidator( validator ); + m_widget = gtk_combo_new(); wxSize newSize = size; @@ -101,21 +89,18 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, gtk_signal_connect( GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); - }; + } 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 ); return TRUE; -}; +} void wxComboBox::Clear(void) { @@ -123,43 +108,67 @@ void wxComboBox::Clear(void) gtk_list_clear_items( GTK_LIST(list), 0, Number() ); m_clientData.Clear(); -}; +} void wxComboBox::Append( const wxString &item ) { Append( item, (char*)NULL ); -}; +} 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 ) ) ); + } + + if (m_backgroundColour != wxNullColour) + { + GtkBin *bin = GTK_BIN( list_item ); + SetBackgroundColourHelper( bin->child->window ); + } 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::Delete wrong index"); + wxFAIL_MSG( "wrong index" ); } else m_clientData.DeleteNode( node ); -}; +} int wxComboBox::FindString( const wxString &item ) { @@ -174,22 +183,30 @@ int wxComboBox::FindString( const wxString &item ) if (item == label->label) return count; count++; child = child->next; - }; + } + + wxFAIL_MSG( "wxComboBox: string not found" ); + return -1; -}; +} char* wxComboBox::GetClientData( int n ) { wxNode *node = m_clientData.Nth( n ); if (node) return (char*)node->Data(); - return NULL; -}; + + wxFAIL_MSG( "wxComboBox: wrong index" ); + + return (char *) NULL; +} void wxComboBox::SetClientData( int n, char * clientData ) { wxNode *node = m_clientData.Nth( n ); if (node) node->SetData( (wxObject*) clientData ); -}; + + wxFAIL_MSG( "wxComboBox: wrong index" ); +} int wxComboBox::GetSelection(void) const { @@ -205,10 +222,13 @@ int wxComboBox::GetSelection(void) const if (child->data == selection->data) return count; count++; child = child->next; - }; - }; + } + } + + wxFAIL_MSG( "wxComboBox: no selection" ); + return -1; -}; +} wxString wxComboBox::GetString( int n ) const { @@ -220,9 +240,12 @@ wxString wxComboBox::GetString( int n ) const GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); return label->label; - }; + } + + wxFAIL_MSG( "wxComboBox: wrong index" ); + return ""; -}; +} wxString wxComboBox::GetStringSelection(void) const { @@ -234,9 +257,12 @@ wxString wxComboBox::GetStringSelection(void) const GtkBin *bin = GTK_BIN( selection->data ); wxString tmp = GTK_LABEL( bin->child )->label; return tmp; - }; + } + + wxFAIL_MSG( "wxComboBox: no selection" ); + return ""; -}; +} int wxComboBox::Number(void) const { @@ -244,29 +270,29 @@ int wxComboBox::Number(void) const GList *child = GTK_LIST(list)->children; int count = 0; - while (child) { count++; child = child->next; }; + 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 ); -}; +} void wxComboBox::SetStringSelection( const wxString &string ) { int res = FindString( string ); if (res == -1) return; SetSelection( res ); -}; +} wxString wxComboBox::GetValue(void) const { GtkWidget *entry = GTK_COMBO(m_widget)->entry; wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) ); return tmp; -}; +} void wxComboBox::SetValue( const wxString& value ) { @@ -274,52 +300,64 @@ void wxComboBox::SetValue( const wxString& value ) wxString tmp = ""; if (!value.IsNull()) tmp = value; gtk_entry_set_text( GTK_ENTRY(entry), tmp ); -}; +} 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 ) { GtkWidget *entry = GTK_COMBO(m_widget)->entry; int tmp = (int) pos; gtk_entry_set_position( GTK_ENTRY(entry), tmp ); -}; +} void wxComboBox::SetInsertionPointEnd(void) { GtkWidget *entry = GTK_COMBO(m_widget)->entry; int pos = GTK_ENTRY(entry)->text_length; SetInsertionPoint( pos-1 ); -}; +} long wxComboBox::GetInsertionPoint(void) const { GtkWidget *entry = GTK_COMBO(m_widget)->entry; return (long) GTK_EDITABLE(entry)->current_pos; -}; +} long wxComboBox::GetLastPosition(void) const { 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 ) { @@ -328,20 +366,83 @@ void wxComboBox::Replace( long from, long to, const wxString& value ) 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 ); -}; +} 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 ) ); +} + +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; + } +} -