X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/150e31d2088687cbfbab548f9e98918f8683d9b5..f773e9b0bbfd051a4ae316461fd241230c87e39f:/src/gtk1/combobox.cpp

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 99e75910c2..9a1c2100bb 100644
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -674,7 +674,7 @@ void wxComboBox::Redo()
 
 void wxComboBox::SelectAll()
 {
-    Select(0, GetLastPosition());
+    SetSelection(0, GetLastPosition());
 }
 
 bool wxComboBox::CanUndo() const
@@ -769,9 +769,16 @@ void wxComboBox::GetSelection( long* from, long* to ) const
 {
     if (IsEditable())
     {
+#ifdef __WXGTK20__
         GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry);
+        gint start, end;
+        gtk_editable_get_selection_bounds(editable, & start, & end);
+        *from = start;
+        *to = end;
+#else
         *from = (long) editable->selection_start_pos;
         *to = (long) editable->selection_end_pos;
+#endif
     }
 }