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

build fix: return type for AutoComplete is bool

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-11-04 23:27:59 +00:00
parent 59396417d3
commit 0c3d1aa7fd
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ public:
virtual void SetSelection(long from, long to); virtual void SetSelection(long from, long to);
virtual void GetSelection(long *from, long *to) const; virtual void GetSelection(long *from, long *to) const;
virtual void AutoComplete(const wxArrayString& choices); virtual bool AutoComplete(const wxArrayString& choices);
virtual bool IsEditable() const; virtual bool IsEditable() const;
virtual void SetEditable(bool editable); virtual void SetEditable(bool editable);

5
src/gtk/textentry.cpp
View File

@@ -221,10 +221,10 @@ void wxTextEntry::GetSelection(long *from, long *to) const
// auto completion // auto completion
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxTextEntry::AutoComplete(const wxArrayString& choices) bool wxTextEntry::AutoComplete(const wxArrayString& choices)
{ {
GtkEntry * const entry = GTK_ENTRY(GetEditable()); GtkEntry * const entry = GTK_ENTRY(GetEditable());
wxCHECK_RET( entry, "auto completion doesn't work with this control" ); wxCHECK_MSG(entry, false, "auto completion doesn't work with this control");
GtkListStore * const store = gtk_list_store_new(1, G_TYPE_STRING); GtkListStore * const store = gtk_list_store_new(1, G_TYPE_STRING);
GtkTreeIter iter; GtkTreeIter iter;
@@ -244,6 +244,7 @@ void wxTextEntry::AutoComplete(const wxArrayString& choices)
gtk_entry_completion_set_text_column(completion, 0); gtk_entry_completion_set_text_column(completion, 0);
gtk_entry_set_completion(entry, completion); gtk_entry_set_completion(entry, completion);
g_object_unref(completion); g_object_unref(completion);
return true;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------