X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9fa72bd2a637cee761c56e2ce61cec3e43c62765..f1e57cb96f520f433bb57a3f6fc006dc6490d028:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index b1c46bdcd8..ae8f2760a2 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -290,7 +290,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, // This is required for tool bar support // wxSize setsize = GetSize(); -// gtk_widget_set_usize( m_widget, setsize.x, setsize.y ); +// gtk_widget_set_size_request( m_widget, setsize.x, setsize.y ); return true; } @@ -691,7 +691,7 @@ void wxComboBox::Copy() wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_editable_copy_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG ); + gtk_editable_copy_clipboard(GTK_EDITABLE(entry)); } void wxComboBox::Cut() @@ -699,7 +699,7 @@ void wxComboBox::Cut() wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_editable_cut_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG ); + gtk_editable_cut_clipboard(GTK_EDITABLE(entry)); } void wxComboBox::Paste() @@ -707,7 +707,7 @@ void wxComboBox::Paste() wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; - gtk_editable_paste_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG); + gtk_editable_paste_clipboard(GTK_EDITABLE(entry)); } void wxComboBox::Undo() @@ -780,7 +780,7 @@ void wxComboBox::SetInsertionPoint( long pos ) long wxComboBox::GetInsertionPoint() const { - return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry ); + return (long) gtk_editable_get_position(GTK_EDITABLE(GTK_COMBO(m_widget)->entry)); } wxTextPos wxComboBox::GetLastPosition() const