Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combobox corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-12-09 15:27:54 +00:00
parent 150e31d208
commit 4e324a3fbf
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/combobox.h
View File

@@ -122,7 +122,7 @@ public:
bool CanUndo() const; bool CanUndo() const;
bool CanRedo() const; bool CanRedo() const;
void SelectAll(); void SelectAll();
bool IsEditable() const { return !HasFlag(wxCB_READONLY); } bool IsEditable() const ;
bool HasSelection() const ; bool HasSelection() const ;
// implementation // implementation

2
include/wx/gtk1/combobox.h
View File

@@ -122,7 +122,7 @@ public:
bool CanUndo() const; bool CanUndo() const;
bool CanRedo() const; bool CanRedo() const;
void SelectAll(); void SelectAll();
bool IsEditable() const { return !HasFlag(wxCB_READONLY); } bool IsEditable() const ;
bool HasSelection() const ; bool HasSelection() const ;
// implementation // implementation

9
src/gtk/combobox.cpp
View File

@@ -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; *from = (long) editable->selection_start_pos;
*to = (long) editable->selection_end_pos; *to = (long) editable->selection_end_pos;
#endif
} }
} }

9
src/gtk1/combobox.cpp
View File

@@ -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; *from = (long) editable->selection_start_pos;
*to = (long) editable->selection_end_pos; *to = (long) editable->selection_end_pos;
#endif
} }
} }