Added a bit of libJPEG 6.0b

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

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 5ab1cd7b75e30c432b5323ea3ffb802a5d9b13f0..54aea8e64706e4f79e59698d2fb271692fd75a58 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -11,7 +11,6 @@
 #pragma implementation "combobox.h"
 #endif
 
-
 #include "wx/combobox.h"
 
 #include <wx/intl.h>
@@ -48,11 +47,9 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 
     wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
     event.SetInt( combo->GetSelection() );
-    event.SetString( copystring(combo->GetStringSelection()) );
+    event.SetString( combo->GetStringSelection() );
     event.SetEventObject( combo );
     combo->GetEventHandler()->ProcessEvent( event );
-
-    delete [] event.GetString();
 }
 
 //-----------------------------------------------------------------------------
@@ -63,11 +60,9 @@ static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
-    event.SetString( copystring(combo->GetValue()) );
+    event.SetString( combo->GetValue() );
     event.SetEventObject( combo );
     combo->GetEventHandler()->ProcessEvent( event );
-
-    delete [] event.GetString();
 }
 
 //-----------------------------------------------------------------------------
@@ -111,7 +106,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
     for (int i = 0; i < n; i++)
     {
-        GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] );
+        GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );
 
         m_clientDataList.Append( (wxObject*)NULL );
         m_clientObjectList.Append( (wxObject*)NULL );
@@ -141,6 +136,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     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);
 
@@ -167,11 +165,11 @@ wxComboBox::~wxComboBox()
 
 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_item = gtk_list_item_new_with_label( item );
+    GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() );
 
     gtk_signal_connect( GTK_OBJECT(list_item), "select",
       GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
@@ -209,7 +207,7 @@ void wxComboBox::Append( const wxString &item, wxClientData *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;
@@ -219,7 +217,7 @@ void wxComboBox::SetClientData( int n, void* clientData )
 
 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;
@@ -229,7 +227,7 @@ void* wxComboBox::GetClientData( int n )
 
 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;
@@ -242,7 +240,7 @@ void wxComboBox::SetClientObject( int n, wxClientData* clientData )
 
 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;
@@ -252,7 +250,7 @@ wxClientData* wxComboBox::GetClientObject( int n )
 
 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() );
@@ -271,7 +269,7 @@ void wxComboBox::Clear()
 
 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 );
 
@@ -279,7 +277,7 @@ void wxComboBox::Delete( int n )
 
     if (!child)
     {
-        wxFAIL_MSG("wrong index");
+        wxFAIL_MSG(_T("wrong index"));
         return;
     }
 
@@ -304,7 +302,7 @@ void wxComboBox::Delete( int n )
 
 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;
 
@@ -325,7 +323,7 @@ int wxComboBox::FindString( const wxString &item )
 
 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;
 
@@ -342,14 +340,14 @@ int wxComboBox::GetSelection() const
         }
     }
 
-    wxFAIL_MSG( "wxComboBox: no selection" );
+    wxFAIL_MSG( _T("wxComboBox: no selection") );
 
     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;
 
@@ -363,7 +361,7 @@ wxString wxComboBox::GetString( int n ) const
     }
     else
     {
-        wxFAIL_MSG( "wxComboBox: wrong index" );
+        wxFAIL_MSG( _T("wxComboBox: wrong index") );
     }
 
     return str;
@@ -371,7 +369,7 @@ wxString wxComboBox::GetString( int n ) 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;
 
@@ -383,14 +381,14 @@ wxString wxComboBox::GetStringSelection() const
         return tmp;
     }
 
-    wxFAIL_MSG( "wxComboBox: no selection" );
+    wxFAIL_MSG( _T("wxComboBox: no selection") );
 
-    return "";
+    return _T("");
 }
 
 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;
 
@@ -402,7 +400,7 @@ int wxComboBox::Number() const
 
 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 );
@@ -410,7 +408,7 @@ void wxComboBox::SetSelection( int n )
 
 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;
@@ -426,20 +424,20 @@ wxString wxComboBox::GetValue() const
 
 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;
-    wxString tmp = "";
+    wxString tmp = _T("");
     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()
 {
-    wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
 
     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 );
@@ -448,10 +446,10 @@ void wxComboBox::Copy()
 
 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;
-#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 );
@@ -460,10 +458,10 @@ void wxComboBox::Cut()
 
 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;
-#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 );
@@ -472,7 +470,7 @@ void wxComboBox::Paste()
 
 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 );
@@ -480,7 +478,7 @@ void wxComboBox::SetInsertionPoint( long pos )
 
 void wxComboBox::SetInsertionPointEnd()
 {
-    wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
 
     SetInsertionPoint( -1 );
 }
@@ -500,18 +498,19 @@ long wxComboBox::GetLastPosition() const
 
 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;
-    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)
 {
-    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 );
@@ -542,7 +541,7 @@ void wxComboBox::OnChar( wxKeyEvent &event )
             // all!
             wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
             event.SetInt( 0 );
-            event.SetString( (char *)value.c_str() );
+            event.SetString( value );
             event.SetEventObject( this );
             GetEventHandler()->ProcessEvent( event );
         }
@@ -556,7 +555,7 @@ void wxComboBox::OnChar( wxKeyEvent &event )
                 // and generate the selected event for it
                 wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
                 event.SetInt( Number() - 1 );
-                event.SetString( (char *)value.c_str() );
+                event.SetString( value );
                 event.SetEventObject( this );
                 GetEventHandler()->ProcessEvent( event );
             }