Committing in .

 fix for gtk-1.x

 Modified Files:
 	wxWidgets/src/gtk/combobox.cpp
 ----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 9a1c2100bbc354794e9263936bc3d4800626947b..6ced6dccaa15fff77c3c654d270f7dfe00fbf34c 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -769,8 +769,8 @@ void wxComboBox::GetSelection( long* from, long* to ) const
 {
     if (IsEditable())
     {
 {
     if (IsEditable())
     {

-#ifdef __WXGTK20__

         GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry);
         GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry);

+#ifdef __WXGTK20__

         gint start, end;
         gtk_editable_get_selection_bounds(editable, & start, & end);
         *from = start;
         gint start, end;
         gtk_editable_get_selection_bounds(editable, & start, & end);
         *from = start;

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 9a1c2100bbc354794e9263936bc3d4800626947b..6ced6dccaa15fff77c3c654d270f7dfe00fbf34c 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -769,8 +769,8 @@ void wxComboBox::GetSelection( long* from, long* to ) const
 {
     if (IsEditable())
     {
 {
     if (IsEditable())
     {

-#ifdef __WXGTK20__

         GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry);
         GtkEditable *editable = GTK_EDITABLE(GTK_COMBO(m_widget)->entry);

+#ifdef __WXGTK20__

         gint start, end;
         gtk_editable_get_selection_bounds(editable, & start, & end);
         *from = start;
         gint start, end;
         gtk_editable_get_selection_bounds(editable, & start, & end);
         *from = start;