X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4494ad58e8474949e73a3e791caf572986352198..8161b5b9f03998a332dbacad3b476a292bc847f6:/src/gtk1/combobox.cpp?ds=sidebyside diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp index 3e05764e55..f5e045a71e 100644 --- a/src/gtk1/combobox.cpp +++ b/src/gtk1/combobox.cpp @@ -20,8 +20,7 @@ #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED -#include -#include +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // idle system @@ -132,7 +131,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, GtkWidget *list = GTK_COMBO(m_widget)->list; +#ifndef __WXGTK20__ gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE ); +#endif for (int i = 0; i < n; i++) { @@ -140,7 +141,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, inserting the first item */ m_alreadySent = TRUE; - GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() ); + GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( choices[i] ) ); m_clientDataList.Append( (wxObject*)NULL ); m_clientObjectList.Append( (wxObject*)NULL ); @@ -186,7 +187,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, } - SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); + SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); SetForegroundColour( parent->GetForegroundColour() ); Show( TRUE ); @@ -214,7 +215,7 @@ void wxComboBox::AppendCommon( const wxString &item ) GtkWidget *list = GTK_COMBO(m_widget)->list; - GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() ); + GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) ); gtk_container_add( GTK_CONTAINER(list), list_item ); @@ -293,7 +294,7 @@ wxClientData* wxComboBox::GetClientObject( int n ) { wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") ); - wxNode *node = m_clientDataList.Nth( n ); + wxNode *node = m_clientObjectList.Nth( n ); if (!node) return (wxClientData*) NULL; return (wxClientData*) node->Data(); @@ -406,7 +407,11 @@ wxString wxComboBox::GetString( int n ) const { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - str = wxString(label->label,*wxConvCurrent); +#ifdef __WXGTK20__ + str = wxGTK_CONV_BACK( gtk_label_get_text( label) ); +#else + str = wxString( label->label ); +#endif } else { @@ -472,8 +477,18 @@ void wxComboBox::SetStringSelection( const wxString &string ) wxString wxComboBox::GetValue() const { - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent); + GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry ); + wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) ); + +#if 0 + for (int i = 0; i < wxStrlen(tmp.c_str()) +1; i++) + { + wxChar c = tmp[i]; + printf( "%d ", (int) (c) ); + } + printf( "\n" ); +#endif + return tmp; } @@ -484,7 +499,7 @@ void wxComboBox::SetValue( const wxString& value ) GtkWidget *entry = GTK_COMBO(m_widget)->entry; wxString tmp = wxT(""); if (!value.IsNull()) tmp = value; - gtk_entry_set_text( GTK_ENTRY(entry), tmp.mbc_str() ); + gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) ); } void wxComboBox::Copy() @@ -492,11 +507,7 @@ void wxComboBox::Copy() wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; -#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0) - gtk_editable_copy_clipboard( GTK_EDITABLE(entry) ); -#else - gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 ); -#endif + gtk_editable_copy_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG ); } void wxComboBox::Cut() @@ -504,11 +515,7 @@ void wxComboBox::Cut() wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; -#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0) - gtk_editable_cut_clipboard( GTK_EDITABLE(entry) ); -#else - gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 ); -#endif + gtk_editable_cut_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG ); } void wxComboBox::Paste() @@ -516,11 +523,7 @@ void wxComboBox::Paste() wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; -#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0) - gtk_editable_paste_clipboard( GTK_EDITABLE(entry) ); -#else - gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 ); -#endif + gtk_editable_paste_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG); } void wxComboBox::SetInsertionPoint( long pos ) @@ -540,8 +543,7 @@ void wxComboBox::SetInsertionPointEnd() long wxComboBox::GetInsertionPoint() const { - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - return (long) GTK_EDITABLE(entry)->current_pos; + return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry ); } long wxComboBox::GetLastPosition() const @@ -554,13 +556,18 @@ long wxComboBox::GetLastPosition() const void wxComboBox::Replace( long from, long to, const wxString& value ) { 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; - gtk_editable_insert_text( GTK_EDITABLE(entry), value.mbc_str(), value.Length(), &pos ); + +#if wxUSE_UNICODE + wxCharBuffer buffer = wxConvUTF8.cWX2MB( value ); + gtk_editable_insert_text( GTK_EDITABLE(entry), (const char*) buffer, strlen( (const char*) buffer ), &pos ); +#else + gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.Length(), &pos ); +#endif } void wxComboBox::Remove(long from, long to) @@ -615,10 +622,29 @@ void wxComboBox::OnChar( wxKeyEvent &event ) event.SetEventObject( this ); GetEventHandler()->ProcessEvent( event ); } - //else: do nothing, this will open the listbox + + // This will invoke the dialog default action, such + // as the clicking the default button. + + wxWindow *top_frame = m_parent; + while (top_frame->GetParent() && !(top_frame->IsTopLevel())) + top_frame = top_frame->GetParent(); + + if (top_frame && GTK_IS_WINDOW(top_frame->m_widget)) + { + GtkWindow *window = GTK_WINDOW(top_frame->m_widget); + + if (window->default_widget) + { + gtk_widget_activate (window->default_widget); + return; + } + } + + return; } } - + event.Skip(); } @@ -708,7 +734,7 @@ wxSize wxComboBox::DoGetBestSize() const size_t count = Number(); for ( size_t n = 0; n < count; n++ ) { - width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str()); + width = (wxCoord)gdk_string_width(font, wxGTK_CONV( GetString(n) ) ); if ( width > ret.x ) ret.x = width; }