Combobox corrections

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index c27d532b472960d6aa9467e1cd02275c817a12c8..7265f891e5e5769307a29a220f6e8523f919872b 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -122,7 +122,7 @@ public:
     bool CanUndo() const;
     bool CanRedo() const;
     void SelectAll();
     bool CanUndo() const;
     bool CanRedo() const;
     void SelectAll();

-    bool IsEditable() const { return !HasFlag(wxCB_READONLY); }
+    bool IsEditable() const ;

     bool HasSelection() const ;
 
     // implementation
     bool HasSelection() const ;
 
     // implementation

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index c27d532b472960d6aa9467e1cd02275c817a12c8..7265f891e5e5769307a29a220f6e8523f919872b 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -122,7 +122,7 @@ public:
     bool CanUndo() const;
     bool CanRedo() const;
     void SelectAll();
     bool CanUndo() const;
     bool CanRedo() const;
     void SelectAll();

-    bool IsEditable() const { return !HasFlag(wxCB_READONLY); }
+    bool IsEditable() const ;

     bool HasSelection() const ;
 
     // implementation
     bool HasSelection() const ;
 
     // implementation

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 99e75910c29905834f95edd67f7051250dcd4d0c..9a1c2100bbc354794e9263936bc3d4800626947b 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -674,7 +674,7 @@ void wxComboBox::Redo()
 
 void wxComboBox::SelectAll()
 {
 
 void wxComboBox::SelectAll()
 {

-    Select(0, GetLastPosition());
+    SetSelection(0, GetLastPosition());

 }
 
 bool wxComboBox::CanUndo() const
 }
 
 bool wxComboBox::CanUndo() const


@@ -769,9 +769,16 @@ 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);

+        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;
         *from = (long) editable->selection_start_pos;
         *to = (long) editable->selection_end_pos;

+#endif

     }
 }
 
     }
 }
 

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 99e75910c29905834f95edd67f7051250dcd4d0c..9a1c2100bbc354794e9263936bc3d4800626947b 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -674,7 +674,7 @@ void wxComboBox::Redo()
 
 void wxComboBox::SelectAll()
 {
 
 void wxComboBox::SelectAll()
 {

-    Select(0, GetLastPosition());
+    SetSelection(0, GetLastPosition());

 }
 
 bool wxComboBox::CanUndo() const
 }
 
 bool wxComboBox::CanUndo() const


@@ -769,9 +769,16 @@ 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);

+        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;
         *from = (long) editable->selection_start_pos;
         *to = (long) editable->selection_end_pos;

+#endif

     }
 }
 
     }
 }