diff options
| -rw-r--r-- | src/lua_interface.c | 6 | ||||
| -rw-r--r-- | src/textadept.c | 6 | ||||
| -rw-r--r-- | src/textadept.h | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/lua_interface.c b/src/lua_interface.c index dc54488a..71c1f07e 100644 --- a/src/lua_interface.c +++ b/src/lua_interface.c @@ -830,12 +830,12 @@ void l_cec_populate() { GtkTreeIter iter; if (!lua_istable(lua, -1)) return warn("command_entry.get_completions_for return not a table."); - gtk_tree_store_clear(cec_store); + gtk_list_store_clear(cec_store); lua_pushnil(lua); while (lua_next(lua, -2)) { if (lua_type(lua, -1) == LUA_TSTRING) { - gtk_tree_store_append(cec_store, &iter, NULL); - gtk_tree_store_set(cec_store, &iter, 0, lua_tostring(lua, -1), -1); + gtk_list_store_append(cec_store, &iter); + gtk_list_store_set(cec_store, &iter, 0, lua_tostring(lua, -1), -1); } else warn("command_entry.get_completions_for: string value expected."); lua_pop(lua, 1); // value } diff --git a/src/textadept.c b/src/textadept.c index c129d14b..1cf899e0 100644 --- a/src/textadept.c +++ b/src/textadept.c @@ -62,7 +62,7 @@ static void button_clicked(GtkWidget *button, gpointer); // Command Entry GtkWidget *command_entry; -GtkTreeStore *cec_store; +GtkListStore *cec_store; GtkEntryCompletion *command_entry_completion; static void c_activated(GtkWidget *widget, gpointer); @@ -208,7 +208,7 @@ void create_ui() { NULL, NULL); gtk_entry_completion_set_popup_set_width(command_entry_completion, FALSE); gtk_entry_completion_set_text_column(command_entry_completion, 0); - cec_store = gtk_tree_store_new(1, G_TYPE_STRING); + cec_store = gtk_list_store_new(1, G_TYPE_STRING); gtk_entry_completion_set_model(command_entry_completion, GTK_TREE_MODEL(cec_store)); gtk_entry_set_completion(GTK_ENTRY(command_entry), command_entry_completion); @@ -1037,6 +1037,6 @@ static gbool cec_match_selected(GtkEntryCompletion*, GtkTreeModel *model, g_signal_emit_by_name(G_OBJECT(command_entry), "insert-at-cursor", text, 0); g_free(text); - gtk_tree_store_clear(cec_store); + gtk_list_store_clear(cec_store); return TRUE; } diff --git a/src/textadept.h b/src/textadept.h index 0f0f60e8..b6d3f1cf 100644 --- a/src/textadept.h +++ b/src/textadept.h @@ -34,7 +34,8 @@ extern GtkWidget *window, *focused_editor, *command_entry, *pm_container, *pm_entry, *pm_view, *findbox, *find_entry, *replace_entry, *fnext_button, *fprev_button, *r_button, *ra_button, *match_case_opt, *whole_word_opt, *lua_opt, *in_files_opt; -extern GtkTreeStore *cec_store, *pm_store; +extern GtkListStore *cec_store; +extern GtkTreeStore *pm_store; extern lua_State *lua; #if !(WIN32 || MAC) static const char *textadept_home = "/usr/share/textadept/"; |