MingW32 compilation works now.

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index d8b6178e1c2d357e6147a581e03c7130dfce4909..b51c7c04abafca10dad4eb3f603edd040da07ee9 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -13,11 +13,22 @@
 
 #include "wx/combobox.h"
 
 
 #include "wx/combobox.h"
 

+#if wxUSE_COMBOBOX
+
+#include "wx/settings.h"
+

 #include <wx/intl.h>
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include <wx/intl.h>
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

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


@@ -31,11 +42,11 @@ extern bool   g_blockEventsOnDrag;
 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 (g_blockEventsOnDrag)
-        return;
+    if (!combo->m_hasVMT) return;
+
+    if (g_blockEventsOnDrag) return;

 
     if (combo->m_alreadySent)
     {
 
     if (combo->m_alreadySent)
     {


@@ -49,6 +60,7 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
     event.SetInt( combo->GetSelection() );
     event.SetString( combo->GetStringSelection() );
     event.SetEventObject( combo );
     event.SetInt( combo->GetSelection() );
     event.SetString( combo->GetStringSelection() );
     event.SetEventObject( combo );

+    

     combo->GetEventHandler()->ProcessEvent( event );
 }
 
     combo->GetEventHandler()->ProcessEvent( event );
 }
 


@@ -59,6 +71,10 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
 static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {

+    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 );
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
     event.SetString( combo->GetValue() );
     event.SetEventObject( combo );


@@ -88,7 +104,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
     PreCreation( parent, id, pos, size, style, name );
 
 
     PreCreation( parent, id, pos, size, style, name );
 

+#if wxUSE_VALIDATORS

     SetValidator( validator );
     SetValidator( validator );

+#endif

 
     m_widget = gtk_combo_new();
 
 
     m_widget = gtk_combo_new();
 


@@ -106,25 +124,24 @@ 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 = 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 );

 
     PostCreation();
 
 
     PostCreation();
 


@@ -132,14 +149,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 );
+    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() );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );

     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 


@@ -150,30 +166,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, _T("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 );
 }


@@ -204,7 +228,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, _T("invalid combobox") );

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


@@ -214,7 +238,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, _T("invalid combobox") );

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


@@ -224,7 +248,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, _T("invalid combobox") );

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


@@ -237,7 +261,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, _T("invalid combobox") );

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


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

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


@@ -266,7 +290,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, _T("invalid combobox") );

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


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

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

         return;
     }
 
         return;
     }
 


@@ -299,7 +323,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, _T("invalid combobox") );

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


@@ -309,7 +333,7 @@ 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)
+        if (item == wxString(label->label,*wxConvCurrent))

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


@@ -320,7 +344,7 @@ int wxComboBox::FindString( const wxString &item )
 
 int wxComboBox::GetSelection() const
 {
 
 int wxComboBox::GetSelection() const
 {

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

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


@@ -337,14 +361,14 @@ int wxComboBox::GetSelection() const
         }
     }
 
         }
     }
 

-    wxFAIL_MSG( "wxComboBox: no selection" );
+    wxFAIL_MSG( _T("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, _T(""), _T("invalid combobox") );

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


@@ -354,11 +378,11 @@ wxString wxComboBox::GetString( int n ) const
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );

-        str = label->label;
+        str = wxString(label->label,*wxConvCurrent);

     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG( "wxComboBox: wrong index" );
+        wxFAIL_MSG( _T("wxComboBox: wrong index") );

     }
 
     return str;
     }
 
     return str;


@@ -366,7 +390,7 @@ wxString wxComboBox::GetString( int n ) const
 
 wxString wxComboBox::GetStringSelection() const
 {
 
 wxString wxComboBox::GetStringSelection() const
 {

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

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


@@ -374,18 +398,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( _T("wxComboBox: no selection") );

 
 

-    return "";
+    return _T("");

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

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

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


@@ -397,7 +421,7 @@ 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, _T("invalid combobox") );

 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
     gtk_list_select_item( GTK_LIST(list), n );
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
     gtk_list_select_item( GTK_LIST(list), n );


@@ -405,7 +429,7 @@ void wxComboBox::SetSelection( int n )
 
 void wxComboBox::SetStringSelection( const wxString &string )
 {
 
 void wxComboBox::SetStringSelection( const wxString &string )
 {

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

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


@@ -415,26 +439,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, _T("invalid combobox") );

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

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

     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, _T("invalid combobox") );

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

-#if (GTK_MINOR_VERSION == 1)
+#if (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 );


@@ -443,10 +467,10 @@ void wxComboBox::Copy()
 
 void wxComboBox::Cut()
 {
 
 void wxComboBox::Cut()
 {

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

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

-#if (GTK_MINOR_VERSION == 1)
+#if (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 );


@@ -455,10 +479,10 @@ void wxComboBox::Cut()
 
 void wxComboBox::Paste()
 {
 
 void wxComboBox::Paste()
 {

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

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

-#if (GTK_MINOR_VERSION == 1)
+#if (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 );


@@ -467,7 +491,7 @@ 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, _T("invalid combobox") );

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


@@ -475,7 +499,7 @@ void wxComboBox::SetInsertionPoint( long pos )
 
 void wxComboBox::SetInsertionPointEnd()
 {
 
 void wxComboBox::SetInsertionPointEnd()
 {

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

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


@@ -495,18 +519,19 @@ 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, _T("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, _T("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 );


@@ -564,7 +589,9 @@ void wxComboBox::OnChar( wxKeyEvent &event )
 
 void wxComboBox::OnSize( wxSizeEvent &event )
 {
 
 void wxComboBox::OnSize( wxSizeEvent &event )
 {

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

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


@@ -577,7 +604,7 @@ void wxComboBox::ApplyWidgetStyle()
 {
     SetWidgetStyle();
 
 {
     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 );
 


@@ -605,3 +632,4 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
              (window == GTK_COMBO(m_widget)->button->window ) );
 }
 
              (window == GTK_COMBO(m_widget)->button->window ) );
 }
 

+#endif