blind fix for wxGIFDecoder::ReadGIF

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 8877506e784eb9f18448e837a16e6aab1205da4e..3e05764e554788c739ffcbe6518ff8b3b3bda0ee 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -11,13 +11,24 @@
 #pragma implementation "combobox.h"
 #endif
 
 #pragma implementation "combobox.h"
 #endif
 

-

 #include "wx/combobox.h"
 
 #include "wx/combobox.h"
 

-#include <wx/intl.h>
+#if wxUSE_COMBOBOX
+
+#include "wx/settings.h"
+#include "wx/intl.h"
+
+#include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------

 
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;

 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data


@@ -29,9 +40,13 @@ extern bool   g_blockEventsOnDrag;
 // "select"
 //-----------------------------------------------------------------------------
 
 // "select"
 //-----------------------------------------------------------------------------
 

-static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+static void
+gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )

 {
 {

-    if (!combo->HasVMT()) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!combo->m_hasVMT) return;
+

     if (g_blockEventsOnDrag) return;
 
     if (combo->m_alreadySent)
     if (g_blockEventsOnDrag) return;
 
     if (combo->m_alreadySent)


@@ -42,26 +57,39 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
 
     combo->m_alreadySent = TRUE;
 
 
     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);
+    int curSelection = combo->GetSelection();
+
+    if (combo->m_prevSelection != curSelection)
+    {
+        GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
+        gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
+    }
+
+    combo->m_prevSelection = curSelection;
+
+    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
+    event.SetInt( curSelection );
+    event.SetString( combo->GetStringSelection() );
+    event.SetEventObject( combo );
+
+    combo->GetEventHandler()->ProcessEvent( event );

 }
 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 

-static void 
+static void

 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {

-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->m_windowId );
-    event.SetString( copystring(combo->GetValue()) );
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!combo->m_hasVMT) return;
+
+    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+    event.SetString( combo->GetValue() );

     event.SetEventObject( combo );
     combo->GetEventHandler()->ProcessEvent( event );
     event.SetEventObject( combo );
     combo->GetEventHandler()->ProcessEvent( event );

-    delete[] event.GetString();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -72,6 +100,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
 
 BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_SIZE(wxComboBox::OnSize)
 
 BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_SIZE(wxComboBox::OnSize)

+    EVT_CHAR(wxComboBox::OnChar)

 END_EVENT_TABLE()
 
 bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 END_EVENT_TABLE()
 
 bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,


@@ -83,41 +112,50 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     m_alreadySent = FALSE;
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
     m_alreadySent = FALSE;
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;

+    m_prevSelection = 0;

 
 

-    PreCreation( parent, id, pos, size, style, name );
-
-    SetValidator( validator );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxComboBox creation failed") );
+        return FALSE;
+    }

 
     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 );
+    // make it more useable
+    gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
+    
+    // and case-sensitive
+    gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
+

 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 

+    gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
+

     for (int i = 0; i < n; i++)
     {
     for (int i = 0; i < n; i++)
     {

-        GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] );
+        /* don't send first event, which GTK sends aways when
+           inserting the first item */
+        m_alreadySent = TRUE;
+
+        GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );

 
         m_clientDataList.Append( (wxObject*)NULL );
         m_clientObjectList.Append( (wxObject*)NULL );
 
         gtk_container_add( GTK_CONTAINER(list), list_item );
 
 
         m_clientDataList.Append( (wxObject*)NULL );
         m_clientObjectList.Append( (wxObject*)NULL );
 
         gtk_container_add( GTK_CONTAINER(list), 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_widget_show( list_item );

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

     }
 
     }
 

-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );
+    
+    m_focusWidget = GTK_COMBO(m_widget)->entry;

 
     PostCreation();
 
 
     PostCreation();
 


@@ -125,14 +163,30 @@ 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 );
+    if (style & wxCB_READONLY)
+        gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE );

 
     gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 
 
     gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 

-    SetBackgroundColour( parent->GetBackgroundColour() );
+    wxSize size_best( DoGetBestSize() );
+    wxSize new_size( size );
+    if (new_size.x == -1)
+        new_size.x = size_best.x;
+    if (new_size.y == -1)
+        new_size.y = size_best.y;
+    if (new_size.y > size_best.y)
+        new_size.y = size_best.y;
+    if ((new_size.x != size.x) || (new_size.y != size.y))
+    {
+        SetSize( new_size.x, new_size.y );
+        
+        // This is required for tool bar support
+        gtk_widget_set_usize( m_widget, new_size.x, new_size.y );
+    }
+
+
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );

     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );
     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );


@@ -142,30 +196,38 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
 wxComboBox::~wxComboBox()
 {
 
 wxComboBox::~wxComboBox()
 {

-    wxNode *node = m_clientDataList.First();
+    wxNode *node = m_clientObjectList.First();

     while (node)
     {
         wxClientData *cd = (wxClientData*)node->Data();
         if (cd) delete cd;
         node = node->Next();
     }
     while (node)
     {
         wxClientData *cd = (wxClientData*)node->Data();
         if (cd) delete cd;
         node = node->Next();
     }

+    m_clientObjectList.Clear();
+

     m_clientDataList.Clear();
 }
 
 void wxComboBox::AppendCommon( const wxString &item )
 {
     m_clientDataList.Clear();
 }
 
 void wxComboBox::AppendCommon( const wxString &item )
 {

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

 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 

-    GtkWidget *list_item = gtk_list_item_new_with_label( item );
+    GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() );
+
+    gtk_container_add( GTK_CONTAINER(list), list_item );

 
     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 );
 

-    gtk_container_add( GTK_CONTAINER(list), list_item );
+    if (GTK_WIDGET_REALIZED(m_widget))
+    {
+        gtk_widget_realize( list_item );
+        gtk_widget_realize( GTK_BIN(list_item)->child );

 
 

-    if (m_widgetStyle) ApplyWidgetStyle();
+        if (m_widgetStyle) ApplyWidgetStyle();
+    }

 
     gtk_widget_show( list_item );
 }
 
     gtk_widget_show( list_item );
 }


@@ -196,7 +258,7 @@ void wxComboBox::Append( const wxString &item, wxClientData *clientData )
 
 void wxComboBox::SetClientData( int n, void* clientData )
 {
 
 void wxComboBox::SetClientData( int n, void* clientData )
 {

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

 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return;
 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return;


@@ -206,7 +268,7 @@ void wxComboBox::SetClientData( int n, void* clientData )
 
 void* wxComboBox::GetClientData( int n )
 {
 
 void* wxComboBox::GetClientData( int n )
 {

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

 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return NULL;
 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return NULL;


@@ -216,7 +278,7 @@ void* wxComboBox::GetClientData( int n )
 
 void wxComboBox::SetClientObject( int n, wxClientData* clientData )
 {
 
 void wxComboBox::SetClientObject( int n, wxClientData* clientData )
 {

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

 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return;
 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return;


@@ -229,7 +291,7 @@ void wxComboBox::SetClientObject( int n, wxClientData* clientData )
 
 wxClientData* wxComboBox::GetClientObject( int n )
 {
 
 wxClientData* wxComboBox::GetClientObject( int n )
 {

-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" );
+    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );

 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return (wxClientData*) NULL;
 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return (wxClientData*) NULL;


@@ -239,7 +301,7 @@ wxClientData* wxComboBox::GetClientObject( int n )
 
 void wxComboBox::Clear()
 {
 
 void wxComboBox::Clear()
 {

-    wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+    wxCHECK_RET( m_widget != NULL, wxT("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() );


@@ -258,7 +320,7 @@ void wxComboBox::Clear()
 
 void wxComboBox::Delete( int n )
 {
 
 void wxComboBox::Delete( int n )
 {

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

 
     GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
 
 
     GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
 


@@ -266,7 +328,7 @@ void wxComboBox::Delete( int n )
 
     if (!child)
     {
 
     if (!child)
     {

-        wxFAIL_MSG("wrong index");
+        wxFAIL_MSG(wxT("wrong index"));

         return;
     }
 
         return;
     }
 


@@ -291,7 +353,7 @@ 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" );
+    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );

 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 


@@ -301,19 +363,18 @@ int wxComboBox::FindString( const wxString &item )
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );

-        if (item == label->label) return count;
+        if (item == wxString(label->label,*wxConvCurrent))
+            return count;

         count++;
         child = child->next;
     }
 
         count++;
         child = child->next;
     }
 

-    wxFAIL_MSG( "wxComboBox: string not found" );
-
-    return -1;
+    return wxNOT_FOUND;

 }
 
 int wxComboBox::GetSelection() const
 {
 }
 
 int wxComboBox::GetSelection() const
 {

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

 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 


@@ -330,33 +391,34 @@ int wxComboBox::GetSelection() const
         }
     }
 
         }
     }
 

-    wxFAIL_MSG( "wxComboBox: no selection" );
-

     return -1;
 }
 
 wxString wxComboBox::GetString( int n ) const
 {
     return -1;
 }
 
 wxString wxComboBox::GetString( int n ) const
 {

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

 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 

+    wxString str;

     GList *child = g_list_nth( GTK_LIST(list)->children, n );
     if (child)
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
     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;
+        str = wxString(label->label,*wxConvCurrent);
+    }
+    else
+    {
+        wxFAIL_MSG( wxT("wxComboBox: wrong index") );

     }
 
     }
 

-    wxFAIL_MSG( "wxComboBox: wrong index" );
-
-    return "";
+    return str;

 }
 
 wxString wxComboBox::GetStringSelection() const
 {
 }
 
 wxString wxComboBox::GetStringSelection() const
 {

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

 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 


@@ -364,18 +426,18 @@ wxString wxComboBox::GetStringSelection() const
     if (selection)
     {
         GtkBin *bin = GTK_BIN( selection->data );
     if (selection)
     {
         GtkBin *bin = GTK_BIN( selection->data );

-        wxString tmp = GTK_LABEL( bin->child )->label;
+        wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);

         return tmp;
     }
 
         return tmp;
     }
 

-    wxFAIL_MSG( "wxComboBox: no selection" );
+    wxFAIL_MSG( wxT("wxComboBox: no selection") );

 
 

-    return "";
+    return wxT("");

 }
 
 int wxComboBox::Number() const
 {
 }
 
 int wxComboBox::Number() const
 {

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

 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 


@@ -387,15 +449,21 @@ int wxComboBox::Number() const
 
 void wxComboBox::SetSelection( int n )
 {
 
 void wxComboBox::SetSelection( int n )
 {

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

 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;

+    gtk_list_unselect_item( GTK_LIST(list), m_prevSelection );

     gtk_list_select_item( GTK_LIST(list), n );
     gtk_list_select_item( GTK_LIST(list), n );

+    m_prevSelection = n;
+
+    EnableEvents();

 }
 
 void wxComboBox::SetStringSelection( const wxString &string )
 {
 }
 
 void wxComboBox::SetStringSelection( const wxString &string )
 {

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

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


@@ -405,26 +473,26 @@ void wxComboBox::SetStringSelection( const wxString &string )
 wxString wxComboBox::GetValue() const
 {
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 wxString wxComboBox::GetValue() const
 {
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;

-    wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) );
+    wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent);

     return tmp;
 }
 
 void wxComboBox::SetValue( const wxString& value )
 {
     return tmp;
 }
 
 void wxComboBox::SetValue( const wxString& value )
 {

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

 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;

-    wxString tmp = "";
+    wxString tmp = wxT("");

     if (!value.IsNull()) tmp = value;
     if (!value.IsNull()) tmp = value;

-    gtk_entry_set_text( GTK_ENTRY(entry), tmp );
+    gtk_entry_set_text( GTK_ENTRY(entry), tmp.mbc_str() );

 }
 
 void wxComboBox::Copy()
 {
 }
 
 void wxComboBox::Copy()
 {

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

 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;

-#if (GTK_MINOR_VERSION == 1)
+#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)

     gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
 #else
     gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
     gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
 #else
     gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );


@@ -433,10 +501,10 @@ void wxComboBox::Copy()
 
 void wxComboBox::Cut()
 {
 
 void wxComboBox::Cut()
 {

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

 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;

-#if (GTK_MINOR_VERSION == 1)
+#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)

     gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
 #else
     gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
     gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
 #else
     gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );


@@ -445,10 +513,10 @@ void wxComboBox::Cut()
 
 void wxComboBox::Paste()
 {
 
 void wxComboBox::Paste()
 {

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

 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;

-#if (GTK_MINOR_VERSION == 1)
+#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)

     gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
 #else
     gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
     gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
 #else
     gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );


@@ -457,15 +525,15 @@ void wxComboBox::Paste()
 
 void wxComboBox::SetInsertionPoint( long pos )
 {
 
 void wxComboBox::SetInsertionPoint( long pos )
 {

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

 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;

-    gtk_entry_set_position( GTK_ENTRY(entry), (int)tmp );
+    gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );

 }
 
 void wxComboBox::SetInsertionPointEnd()
 {
 }
 
 void wxComboBox::SetInsertionPointEnd()
 {

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

 
     SetInsertionPoint( -1 );
 }
 
     SetInsertionPoint( -1 );
 }


@@ -485,49 +553,119 @@ long wxComboBox::GetLastPosition() 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" );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    // FIXME: not quite sure how to do this method right in multibyte mode

 
     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;
 
     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 );
+    gtk_editable_insert_text( GTK_EDITABLE(entry), value.mbc_str(), value.Length(), &pos );

 }
 
 void wxComboBox::Remove(long from, long to)
 {
 }
 
 void wxComboBox::Remove(long from, long to)
 {

-    wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+    wxCHECK_RET( m_widget != NULL, wxT("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 );
 }
 

-void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
+void wxComboBox::SetSelection( long from, long to )
+{
+    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+    gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
+}
+
+void wxComboBox::SetEditable( bool editable )
+{
+    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+    gtk_entry_set_editable( GTK_ENTRY(entry), editable );
+}
+
+void wxComboBox::OnChar( wxKeyEvent &event )

 {
 {

-    wxFAIL_MSG( "wxComboBox::SetSelection not implemented" );
+    if ( event.KeyCode() == WXK_RETURN )
+    {
+        wxString value = GetValue();
+
+        if ( Number() == 0 )
+        {
+            // make Enter generate "selected" event if there is only one item
+            // in the combobox - without it, it's impossible to select it at
+            // all!
+            wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
+            event.SetInt( 0 );
+            event.SetString( value );
+            event.SetEventObject( this );
+            GetEventHandler()->ProcessEvent( event );
+        }
+        else
+        {
+            // add the item to the list if it's not there yet
+            if ( FindString(value) == wxNOT_FOUND )
+            {
+                Append(value);
+                SetStringSelection(value);
+
+                // and generate the selected event for it
+                wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
+                event.SetInt( Number() - 1 );
+                event.SetString( value );
+                event.SetEventObject( this );
+                GetEventHandler()->ProcessEvent( event );
+            }
+            //else: do nothing, this will open the listbox
+        }
+    }
+
+    event.Skip();
+}
+
+void wxComboBox::DisableEvents()
+{
+    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
+    GList *child = list->children;
+    while (child)
+    {
+        gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
+          GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+
+        child = child->next;
+    }

 }
 
 }
 

-void wxComboBox::SetEditable( bool WXUNUSED(editable) )
+void wxComboBox::EnableEvents()

 {
 {

-    wxFAIL_MSG( "wxComboBox::SetEditable not implemented" );
+    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
+    GList *child = list->children;
+    while (child)
+    {
+        gtk_signal_connect( GTK_OBJECT(child->data), "select",
+          GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+
+        child = child->next;
+    }

 }
 
 void wxComboBox::OnSize( wxSizeEvent &event )
 {
 }
 
 void wxComboBox::OnSize( wxSizeEvent &event )
 {

-    wxControl::OnSize( event );
+    event.Skip();

 
 

+#if 0

     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 );
     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 );

+#endif // 0

 }
 
 void wxComboBox::ApplyWidgetStyle()
 {
     SetWidgetStyle();
 
 }
 
 void wxComboBox::ApplyWidgetStyle()
 {
     SetWidgetStyle();
 

-    gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle );
+//    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 );
 
     gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle );
     gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle );
 


@@ -555,3 +693,31 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
              (window == GTK_COMBO(m_widget)->button->window ) );
 }
 
              (window == GTK_COMBO(m_widget)->button->window ) );
 }
 

+wxSize wxComboBox::DoGetBestSize() const
+{
+    wxSize ret( wxControl::DoGetBestSize() );
+
+    // we know better our horizontal extent: it depends on the longest string
+    // in the combobox
+    ret.x = 0;
+    if ( m_widget )
+    {
+        GdkFont *font = m_font.GetInternalFont();
+
+        wxCoord width;
+        size_t count = Number();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str());
+            if ( width > ret.x )
+                ret.x = width;
+        }
+    }
+
+    // empty combobox should have some reasonable default size too
+    if ( ret.x < 100 )
+        ret.x = 100;
+    return ret;
+}
+
+#endif