Commits January 2013

commits@lists.geany.org

1 participants
51 discussions

[geany/geany] 3ae884: Make X11 backend specific code GTK3-proof
by Colomban Wendling 29 Jan '13

29 Jan '13

1 0

[geany/geany] 640984: Get rid of GtkComboBoxEntry API and use GtkComboBoxText API
by Colomban Wendling 29 Jan '13

29 Jan '13

Branch: refs/heads/gtk3-support Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 08 Oct 2012 18:08:06 UTC Commit: 6409840d4af0f59c18f392d39952ac114bde4052 https://github.com/geany/geany/commit/6409840d4af0f59c18f392d39952ac114bde4… Log Message: ----------- Get rid of GtkComboBoxEntry API and use GtkComboBoxText API Use the GtkComboBoxText API and the GtkComboBoxEntry replacement API and map those to the old equivalents if not available. This changes the type exposed by ui_combo_box_add_to_history() from GtkComboBoxEntry to either GtkComboBox (under GTK2) or GtkComboBoxText (under GTK3). This should not be too much of an issue since GtkComboBoxEntry and GtkComboBoxtext are subclasses of GtkComboBox, but this will still emit warnings when when the calling code passes a GtkComboBoxEntry pointer to ui_combo_box_add_to_history(). However, this requires the calling code to use the same mapping as we do (GtkComboBoxText = GtkComboBox on GTK2, even on 2.24), or things will blow and it'll be hard to understand why. This wouldn't be an issue if the calling code includes our gtkcompat.h header everywhere it deals with combo boxes, which will be the case if it includes the Geany headers everywhere but probably won't otherwise. Oh dear. A possible kind of workaround may be for ui_combo_box_add_to_history() to do type-checking on its argument and use the actually correct API for that type. Modified Paths: -------------- plugins/filebrowser.c plugins/saveactions.c src/Makefile.am src/dialogs.c src/gtkcompat.h src/plugindata.h src/search.c src/stash.c src/ui_utils.c src/ui_utils.h Modified: plugins/filebrowser.c 9 files changed, 5 insertions(+), 4 deletions(-) =================================================================== @@ -26,6 +26,7 @@ #endif #include "geanyplugin.h" +#include "gtkcompat.h" #include <string.h> #include <gdk/gdkkeysyms.h> @@ -280,7 +281,7 @@ static void refresh(void) utf8_dir = utils_get_utf8_from_locale(current_dir); gtk_entry_set_text(GTK_ENTRY(path_entry), utf8_dir); gtk_widget_set_tooltip_text(path_entry, utf8_dir); - ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(path_combo), utf8_dir, 0); + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(path_combo), utf8_dir, 0); g_free(utf8_dir); add_top_level_entry(); /* ".." item */ @@ -804,7 +805,7 @@ static void on_filter_activate(GtkEntry *entry, gpointer user_data) { clear_filter(); } - ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(filter_combo), NULL, 0); + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(filter_combo), NULL, 0); refresh(); } @@ -898,7 +899,7 @@ static GtkWidget *make_filterbar(void) label = gtk_label_new(_("Filter:")); - filter_combo = gtk_combo_box_entry_new_text(); + filter_combo = gtk_combo_box_text_new_with_entry(); filter_entry = gtk_bin_get_child(GTK_BIN(filter_combo)); ui_entry_add_clear_icon(GTK_ENTRY(filter_entry)); @@ -1092,7 +1093,7 @@ void plugin_init(GeanyData *data) filterbar = make_filterbar(); gtk_box_pack_start(GTK_BOX(file_view_vbox), filterbar, FALSE, FALSE, 0); - path_combo = gtk_combo_box_entry_new_text(); + path_combo = gtk_combo_box_text_new_with_entry(); gtk_box_pack_start(GTK_BOX(file_view_vbox), path_combo, FALSE, FALSE, 2); g_signal_connect(path_combo, "changed", G_CALLBACK(ui_combo_box_changed), NULL); path_entry = gtk_bin_get_child(GTK_BIN(path_combo)); Modified: plugins/saveactions.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -430,8 +430,8 @@ static void configure_response_cb(GtkDialog *dialog, gint response, G_GNUC_UNUSE GTK_TOGGLE_BUTTON(pref_widgets.autosave_save_all_radio2)); g_free(instantsave_default_ft); - instantsave_default_ft = gtk_combo_box_get_active_text( - GTK_COMBO_BOX(pref_widgets.instantsave_ft_combo)); + instantsave_default_ft = gtk_combo_box_text_get_active_text( + GTK_COMBO_BOX_TEXT(pref_widgets.instantsave_ft_combo)); text_dir = gtk_entry_get_text(GTK_ENTRY(pref_widgets.backupcopy_entry_dir)); text_time = gtk_entry_get_text(GTK_ENTRY(pref_widgets.backupcopy_entry_time)); @@ -621,13 +621,13 @@ GtkWidget *plugin_configure(GtkDialog *dialog) gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE, FALSE, 0); - pref_widgets.instantsave_ft_combo = combo = gtk_combo_box_new_text(); + pref_widgets.instantsave_ft_combo = combo = gtk_combo_box_text_new(); i = 0; foreach_slist(node, filetypes_get_sorted_by_name()) { GeanyFiletype *ft = node->data; - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), ft->name); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), ft->name); if (utils_str_equal(ft->name, instantsave_default_ft)) gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i); Modified: src/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -60,6 +60,7 @@ geany_include_HEADERS = \ encodings.h \ filetypes.h \ geany.h \ + gtkcompat.h \ highlighting.h \ keybindings.h \ msgwindow.h \ Modified: src/dialogs.c 11 files changed, 6 insertions(+), 5 deletions(-) =================================================================== @@ -55,6 +55,7 @@ #include "build.h" #include "main.h" #include "project.h" +#include "gtkcompat.h" enum @@ -326,7 +327,7 @@ static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) (GtkAttachOptions) (0), 4, 5); /* the ebox is for the tooltip, because gtk_combo_box can't show tooltips */ filetype_ebox = gtk_event_box_new(); - filetype_combo = gtk_combo_box_new_text(); + filetype_combo = gtk_combo_box_text_new(); gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(filetype_combo), 2); gtk_widget_set_tooltip_text(filetype_ebox, _("Explicitly defines a filetype for the file, if it would not be detected by filename extension.\nNote if you choose multiple files, they will all be opened with the chosen filetype.")); @@ -384,7 +385,7 @@ static GtkWidget *create_open_file_dialog(void) gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), add_file_open_extra_widget(dialog)); filetype_combo = ui_lookup_widget(dialog, "filetype_combo"); - gtk_combo_box_append_text(GTK_COMBO_BOX(filetype_combo), _("Detect by file extension")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(filetype_combo), _("Detect by file extension")); /* add FileFilters(start with "All Files") */ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filetypes_create_file_filter(filetypes[GEANY_FILETYPES_NONE])); @@ -397,7 +398,7 @@ static GtkWidget *create_open_file_dialog(void) if (G_UNLIKELY(ft->id == GEANY_FILETYPES_NONE)) continue; - gtk_combo_box_append_text(GTK_COMBO_BOX(filetype_combo), ft->title); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(filetype_combo), ft->title); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filetypes_create_file_filter(ft)); } gtk_combo_box_set_active(GTK_COMBO_BOX(filetype_combo), 0); @@ -971,7 +972,7 @@ void dialogs_show_open_font() if (persistent) { GtkWidget *combo = (GtkWidget *) g_object_get_data(G_OBJECT(dialog), "combo"); - ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(combo), str, 0); + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(combo), str, 0); } input_cb(str); } @@ -995,7 +996,7 @@ static void add_input_widgets(GtkWidget *dialog, GtkWidget *vbox, if (persistent) /* remember previous entry text in a combo box */ { - GtkWidget *combo = gtk_combo_box_entry_new_text(); + GtkWidget *combo = gtk_combo_box_text_new_with_entry(); entry = gtk_bin_get_child(GTK_BIN(combo)); ui_entry_add_clear_icon(GTK_ENTRY(entry)); Modified: src/gtkcompat.h 31 files changed, 31 insertions(+), 0 deletions(-) =================================================================== @@ -31,6 +31,37 @@ G_BEGIN_DECLS +/* GtkComboBoxText */ +/* This is actually available in GTK 2.24, but we expose GtkComboBoxText in the + * API so we don't want the type to change for no good reason (although this + * should probably be harmless since it's only a derivated type). However, since + * a plugin needs to be rebuilt and tuned to work with GTK3 we don't mind that + * a type changes between the GTK2 and GTK3 version */ +#if ! GTK_CHECK_VERSION(3, 0, 0) +/* undef those not to get warnings about redefinitions under GTK 2.24 */ +# undef GTK_COMBO_BOX_TEXT +# undef GTK_COMBO_BOX_TEXT_CLASS +# undef GTK_COMBO_BOX_TEXT_GET_CLASS +# undef GTK_IS_COMBO_BOX_TEXT +# undef GTK_IS_COMBO_BOX_TEXT_CLASS +# undef GTK_TYPE_COMBO_BOX_TEXT + +# define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX +# define GTK_COMBO_BOX_TEXT_CLASS GTK_COMBO_BOX_CLASS +# define GTK_COMBO_BOX_TEXT_GET_CLASS GTK_COMBO_BOX_GET_CLASS +# define GTK_IS_COMBO_BOX_TEXT GTK_IS_COMBO_BOX +# define GTK_IS_COMBO_BOX_TEXT_CLASS GTK_IS_COMBO_BOX_CLASS +# define GTK_TYPE_COMBO_BOX_TEXT GTK_TYPE_COMBO_BOX +# define GtkComboBoxText GtkComboBox +# define gtk_combo_box_text_new gtk_combo_box_new_text +# define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text +# define gtk_combo_box_text_append_text gtk_combo_box_append_text +# define gtk_combo_box_text_insert_text gtk_combo_box_insert_text +# define gtk_combo_box_text_prepend_text gtk_combo_box_prepend_text +# define gtk_combo_box_text_remove gtk_combo_box_remove_text +# define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text +#endif + /* GtkDialog */ /* GTK 2.22 deprecated dialog separators and 3.0 removed them * We keep those however in case 2.16 has separators by default */ Modified: src/plugindata.h 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -41,6 +41,7 @@ #include "editor.h" /* GeanyIndentType */ #include "build.h" /* GeanyBuildGroup, GeanyBuildSource, GeanyBuildCmdEntries enums */ +#include "gtkcompat.h" /** The Application Programming Interface (API) version, incremented @@ -476,7 +477,7 @@ void (*ui_widget_modify_font_from_string) (GtkWidget *widget, const gchar *str); gboolean (*ui_is_keyval_enter_or_return) (guint keyval); gint (*ui_get_gtk_settings_integer) (const gchar *property_name, gint default_value); - void (*ui_combo_box_add_to_history) (GtkComboBoxEntry *combo_entry, + void (*ui_combo_box_add_to_history) (GtkComboBoxText *combo_entry, const gchar *text, gint history_len); void (*ui_menu_add_document_items_sorted) (GtkMenu *menu, struct GeanyDocument *active, GCallback callback, GCompareFunc compare_func); Modified: src/search.c 33 files changed, 16 insertions(+), 17 deletions(-) =================================================================== @@ -456,7 +456,7 @@ static void create_find_dialog(void) label = gtk_label_new_with_mnemonic(_("_Search for:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - entry = gtk_combo_box_entry_new_text(); + entry = gtk_combo_box_text_new_with_entry(); ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry)))); gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 50); @@ -618,14 +618,14 @@ static void create_replace_dialog(void) label_replace = gtk_label_new_with_mnemonic(_("Replace wit_h:")); gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5); - entry_find = gtk_combo_box_entry_new_text(); + entry_find = gtk_combo_box_text_new_with_entry(); ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find)))); gtk_label_set_mnemonic_widget(GTK_LABEL(label_find), entry_find); gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))), 50); ui_hookup_widget(replace_dlg.dialog, entry_find, "entry_find"); replace_dlg.find_entry = gtk_bin_get_child(GTK_BIN(entry_find)); - entry_replace = gtk_combo_box_entry_new_text(); + entry_replace = gtk_combo_box_text_new_with_entry(); ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace)))); gtk_label_set_mnemonic_widget(GTK_LABEL(label_replace), entry_replace); gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 50); @@ -854,7 +854,7 @@ static void create_fif_dialog(void) label = gtk_label_new_with_mnemonic(_("_Search for:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - combo = gtk_combo_box_entry_new_text(); + combo = gtk_combo_box_text_new_with_entry(); entry = gtk_bin_get_child(GTK_BIN(combo)); ui_entry_add_clear_icon(GTK_ENTRY(entry)); gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); @@ -878,7 +878,7 @@ static void create_fif_dialog(void) ui_hookup_widget(fif_dlg.dialog, combo_files_mode, "combo_files_mode"); fif_dlg.files_mode_combo = combo_files_mode; - fcombo = gtk_combo_box_entry_new_text(); + fcombo = gtk_combo_box_text_new_with_entry(); entry = gtk_bin_get_child(GTK_BIN(fcombo)); ui_entry_add_clear_icon(GTK_ENTRY(entry)); gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); @@ -897,7 +897,7 @@ static void create_fif_dialog(void) label1 = gtk_label_new_with_mnemonic(_("_Directory:")); gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5); - dir_combo = gtk_combo_box_entry_new_text(); + dir_combo = gtk_combo_box_text_new_with_entry(); entry = gtk_bin_get_child(GTK_BIN(dir_combo)); ui_entry_add_clear_icon(GTK_ENTRY(entry)); gtk_label_set_mnemonic_widget(GTK_LABEL(label1), entry); @@ -915,11 +915,11 @@ static void create_fif_dialog(void) label2 = gtk_label_new_with_mnemonic(_("E_ncoding:")); gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5); - e_combo = gtk_combo_box_new_text(); + e_combo = gtk_combo_box_text_new(); for (i = 0; i < GEANY_ENCODINGS_MAX; i++) { encoding_string = encodings_to_string(&encodings[i]); - gtk_combo_box_append_text(GTK_COMBO_BOX(e_combo), encoding_string); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e_combo), encoding_string); g_free(encoding_string); } gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(e_combo), 3); @@ -1037,7 +1037,7 @@ void search_show_find_in_files_dialog(const gchar *dir) * (in create_fif_dialog() it would fail if a project is opened after dialog creation) */ if (app->project != NULL && NZV(app->project->base_path)) { - ui_combo_box_prepend_text_once(GTK_COMBO_BOX(fif_dlg.dir_combo), + ui_combo_box_prepend_text_once(GTK_COMBO_BOX_TEXT(fif_dlg.dir_combo), app->project->base_path); } @@ -1056,8 +1056,7 @@ void search_show_find_in_files_dialog(const gchar *dir) if (doc == last_doc && cur_dir && utils_str_equal(cur_dir, last_cur_dir)) { /* in case the user now wants the current directory, add it to history */ - ui_combo_box_add_to_history( - GTK_COMBO_BOX_ENTRY(fif_dlg.dir_combo), cur_dir, 0); + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(fif_dlg.dir_combo), cur_dir, 0); SETPTR(cur_dir, NULL); } else @@ -1242,7 +1241,7 @@ gint search_mark_all(GeanyDocument *doc, const gchar *search_text, gint flags) if (! utils_str_replace_escape(search_data.text, FALSE)) goto fail; } - ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(user_data), search_data.original_text, 0); + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(user_data), search_data.original_text, 0); switch (response) { @@ -1379,9 +1378,9 @@ static void replace_in_session(GeanyDocument *doc, goto fail; } - ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY( + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT( gtk_widget_get_parent(replace_dlg.find_entry)), original_find, 0); - ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY( + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT( gtk_widget_get_parent(replace_dlg.replace_entry)), original_replace, 0); switch (response) @@ -1521,9 +1520,9 @@ static GString *get_grep_options(void) if (search_find_in_files(search_text, locale_dir, opts->str, enc)) { - ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(search_combo), search_text, 0); - ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(fif_dlg.files_combo), NULL, 0); - ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(dir_combo), utf8_dir, 0); + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(search_combo), search_text, 0); + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(fif_dlg.files_combo), NULL, 0); + ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(dir_combo), utf8_dir, 0); gtk_widget_hide(fif_dlg.dialog); } g_free(locale_dir); Modified: src/stash.c 24 files changed, 22 insertions(+), 2 deletions(-) =================================================================== @@ -85,6 +85,26 @@ #include "stash.h" +/* GTK3 removed ComboBoxEntry, but we need a value to differentiate combo box with and + * without entries, and it must not collide with other GTypes */ +#ifdef GTK_TYPE_COMBO_BOX_ENTRY +# define TYPE_COMBO_BOX_ENTRY GTK_TYPE_COMBO_BOX_ENTRY +#else /* !GTK_TYPE_COMBO_BOX_ENTRY */ +# define TYPE_COMBO_BOX_ENTRY get_combo_box_entry_type() +static GType get_combo_box_entry_type(void) +{ + static volatile gsize type = 0; + if (g_once_init_enter(&type)) + { + GType g_type = g_type_register_static_simple(GTK_TYPE_COMBO_BOX, "dummy-combo-box-entry", + sizeof(GtkComboBoxClass), NULL, sizeof(GtkComboBox), NULL, G_TYPE_FLAG_ABSTRACT); + g_once_init_leave(&type, g_type); + } + return type; +} +#endif /* !GTK_TYPE_COMBO_BOX_ENTRY */ + + struct StashPref { GType setting_type; /* e.g. G_TYPE_INT */ @@ -696,7 +716,7 @@ static void pref_action(PrefAction action, StashGroup *group, GtkWidget *owner) handle_spin_button(widget, entry, action); else if (entry->widget_type == GTK_TYPE_COMBO_BOX) handle_combo_box(widget, entry, action); - else if (entry->widget_type == GTK_TYPE_COMBO_BOX_ENTRY) + else if (entry->widget_type == TYPE_COMBO_BOX_ENTRY) handle_combo_box_entry(widget, entry, action); else if (entry->widget_type == GTK_TYPE_ENTRY) handle_entry(widget, entry, action); @@ -861,7 +881,7 @@ void stash_group_add_combo_box_entry(StashGroup *group, gchar **setting, const gchar *key_name, const gchar *default_value, StashWidgetID widget_id) { add_widget_pref(group, G_TYPE_STRING, setting, key_name, (gpointer)default_value, - GTK_TYPE_COMBO_BOX_ENTRY, widget_id); + TYPE_COMBO_BOX_ENTRY, widget_id); } Modified: src/ui_utils.c 12 files changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -1544,7 +1544,7 @@ static gboolean tree_model_find_text(GtkTreeModel *model, * @param combo_entry . * @param text Text to add, or @c NULL for current entry text. * @param history_len Max number of items, or @c 0 for default. */ -void ui_combo_box_add_to_history(GtkComboBoxEntry *combo_entry, +void ui_combo_box_add_to_history(GtkComboBoxText *combo_entry, const gchar *text, gint history_len) { GtkComboBox *combo = GTK_COMBO_BOX(combo_entry); @@ -1563,7 +1563,7 @@ void ui_combo_box_add_to_history(GtkComboBoxEntry *combo_entry, { gtk_list_store_remove(GTK_LIST_STORE(model), &iter); } - gtk_combo_box_prepend_text(combo, text); + gtk_combo_box_text_prepend_text(combo_entry, text); /* limit history */ path = gtk_tree_path_new_from_indices(history_len, -1); @@ -1575,18 +1575,18 @@ void ui_combo_box_add_to_history(GtkComboBoxEntry *combo_entry, } -/* Same as gtk_combo_box_prepend_text(), except that text is only prepended if it not already +/* Same as gtk_combo_box_text_prepend_text(), except that text is only prepended if it not already * exists in the combo's model. */ -void ui_combo_box_prepend_text_once(GtkComboBox *combo, const gchar *text) +void ui_combo_box_prepend_text_once(GtkComboBoxText *combo, const gchar *text) { GtkTreeModel *model; GtkTreeIter iter; - model = gtk_combo_box_get_model(combo); + model = gtk_combo_box_get_model(GTK_COMBO_BOX(combo)); if (tree_model_find_text(model, &iter, 0, text)) return; /* don't prepend duplicate */ - gtk_combo_box_prepend_text(combo, text); + gtk_combo_box_text_prepend_text(combo, text); } Modified: src/ui_utils.h 6 files changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -22,6 +22,8 @@ #ifndef GEANY_UI_UTILS_H #define GEANY_UI_UTILS_H 1 +#include "gtkcompat.h" + G_BEGIN_DECLS @@ -195,10 +197,10 @@ enum void ui_hbutton_box_copy_layout(GtkButtonBox *master, GtkButtonBox *copy); -void ui_combo_box_add_to_history(GtkComboBoxEntry *combo_entry, +void ui_combo_box_add_to_history(GtkComboBoxText *combo_entry, const gchar *text, gint history_len); -void ui_combo_box_prepend_text_once(GtkComboBox *combo, const gchar *text); +void ui_combo_box_prepend_text_once(GtkComboBoxText *combo, const gchar *text); GtkWidget *ui_path_box_new(const gchar *title, GtkFileChooserAction action, GtkEntry *entry); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fa5a00: Map GeanyWrapLabel to GtkLabel on GTK3
by Colomban Wendling 29 Jan '13

29 Jan '13

1 0

[geany/geany] 6c942c: Prevent plugins built against GTK2 Geany from loading in GTK3 Geany
by Colomban Wendling 29 Jan '13

29 Jan '13

Branch: refs/heads/gtk3-support Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 09 Oct 2012 11:24:42 UTC Commit: 6c942c1436fa91c715cc90ce0d046627e75e3306 https://github.com/geany/geany/commit/6c942c1436fa91c715cc90ce0d046627e75e3… Log Message: ----------- Prevent plugins built against GTK2 Geany from loading in GTK3 Geany Modified Paths: -------------- src/plugindata.h Modified: src/plugindata.h 9 files changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -57,12 +57,19 @@ */ #define GEANY_API_VERSION 216 +/* hack to have a different ABI when built with GTK3 because loading GTK2-linked plugins + * with GTK3-linked Geany leads to crash */ +#if GTK_CHECK_VERSION(3, 0, 0) +# define GEANY_ABI_SHIFT 8 +#else +# define GEANY_ABI_SHIFT 0 +#endif /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. * Changing this forces all plugins to be recompiled before Geany can load them. */ /* This should usually stay the same if fields are only appended, assuming only pointers to * structs and not structs themselves are declared by plugins. */ -#define GEANY_ABI_VERSION 69 +#define GEANY_ABI_VERSION (69 << GEANY_ABI_SHIFT) /** Defines a function to check the plugin is safe to load. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c5985f: Add ::draw handler for GTK3 where we have ::expose-event handlers
by Colomban Wendling 29 Jan '13

29 Jan '13

1 0

[geany/geany] a763e3: Don't access GtkWidget fields directly
by Colomban Wendling 29 Jan '13

29 Jan '13

Branch: refs/heads/gtk3-support Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 08 Oct 2012 18:08:06 UTC Commit: a763e307f7f211b46589738e6476b72bb1d2a0de https://github.com/geany/geany/commit/a763e307f7f211b46589738e6476b72bb1d2a… Log Message: ----------- Don't access GtkWidget fields directly Since many accessor are new in GTK versions we don't depend on, add a header that defines them to the direct access if they aren't available. Modified Paths: -------------- plugins/saveactions.c plugins/splitwindow.c src/Makefile.am src/build.c src/callbacks.c src/editor.c src/gb.c src/gtkcompat.h src/keybindings.c src/notebook.c src/search.c src/ui_utils.c src/vte.c Modified: plugins/saveactions.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -25,6 +25,7 @@ #endif #include "geanyplugin.h" +#include "gtkcompat.h" #include <unistd.h> #include <errno.h> @@ -529,7 +530,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog) vbox = gtk_vbox_new(FALSE, 6); notebook = gtk_notebook_new(); - GTK_WIDGET_UNSET_FLAGS(notebook, GTK_CAN_FOCUS); + gtk_widget_set_can_focus(notebook, FALSE); gtk_container_set_border_width(GTK_CONTAINER(notebook), 5); gtk_box_pack_start(GTK_BOX(vbox), notebook, FALSE, TRUE, 0); Modified: plugins/splitwindow.c 5 files changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -26,6 +26,7 @@ #endif #include "geanyplugin.h" +#include "gtkcompat.h" #include <string.h> @@ -300,8 +301,8 @@ static void split_view(gboolean horizontal) GtkWidget *parent = gtk_widget_get_parent(notebook); GtkWidget *pane, *toolbar, *box; GeanyDocument *doc = document_get_current(); - gint width = notebook->allocation.width / 2; - gint height = notebook->allocation.height / 2; + gint width = gtk_widget_get_allocated_width(notebook) / 2; + gint height = gtk_widget_get_allocated_height(notebook) / 2; g_return_if_fail(doc); g_return_if_fail(edit_window.editor == NULL); Modified: src/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -20,6 +20,7 @@ SRCS = \ geanymenubuttonaction.c geanymenubuttonaction.h \ geanyobject.c geanyobject.h \ geanywraplabel.c geanywraplabel.h \ + gtkcompat.h \ highlighting.c highlighting.h \ highlightingmappings.h \ keybindings.c keybindings.h \ Modified: src/build.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -61,6 +61,7 @@ #include "win32.h" #include "toolbar.h" #include "geanymenubuttonaction.h" +#include "gtkcompat.h" /* g_spawn_async_with_pipes doesn't work on Windows */ #ifdef G_OS_WIN32 @@ -1936,7 +1937,7 @@ static void on_label_button_clicked(GtkWidget *wid, gpointer user_data) const gchar *old = gtk_button_get_label(GTK_BUTTON(wid)); gchar *str; - if (GTK_WIDGET_TOPLEVEL(top_level) && GTK_IS_WINDOW(top_level)) + if (gtk_widget_is_toplevel(top_level) && GTK_IS_WINDOW(top_level)) str = dialogs_show_input(_("Set menu item label"), GTK_WINDOW(top_level), NULL, old); else str = dialogs_show_input(_("Set menu item label"), NULL, NULL, old); Modified: src/callbacks.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -65,6 +65,7 @@ #include "toolbar.h" #include "highlighting.h" #include "pluginutils.h" +#include "gtkcompat.h" #ifdef HAVE_VTE @@ -1811,7 +1812,7 @@ G_MODULE_EXPORT void on_back_activate(GtkMenuItem *menuitem, gpointer user_data) G_MODULE_EXPORT gboolean on_motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer user_data) { - if (prefs.auto_focus && ! GTK_WIDGET_HAS_FOCUS(widget)) + if (prefs.auto_focus && ! gtk_widget_has_focus(widget)) gtk_widget_grab_focus(widget); return FALSE; Modified: src/editor.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -60,6 +60,7 @@ #include "projectprivate.h" #include "main.h" #include "highlighting.h" +#include "gtkcompat.h" /* Note: use sciwrappers.h instead where possible. @@ -191,7 +192,7 @@ static void on_snippet_keybinding_activate(gchar *key) const gchar *s; GHashTable *specials; - if (!doc || !GTK_WIDGET_HAS_FOCUS(doc->editor->sci)) + if (!doc || !gtk_widget_has_focus(GTK_WIDGET(doc->editor->sci))) return; s = snippets_find_completion_by_name(doc->file_type->name, key); Modified: src/gb.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -29,6 +29,7 @@ #include <signal.h> #include <unistd.h> #include <gdk-pixbuf/gdk-pixdata.h> +#include "gtkcompat.h" #define MAX_PICS 10 #define LOOP_DELAY 200000 /* micro seconds */ @@ -191,7 +192,7 @@ static GtkWidget *create_help_dialog(GtkWindow *parent) okbutton1 = gtk_button_new_from_stock(GTK_STOCK_OK); gtk_widget_show(okbutton1); gtk_dialog_add_action_widget(GTK_DIALOG(help_dialog), okbutton1, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS(okbutton1, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(okbutton1, TRUE); return help_dialog; } Modified: src/gtkcompat.h 57 files changed, 57 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,57 @@ +/* + * gtkcompat.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2012 Colomban Wendling <ban(at)herbesfolles(dot)org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* Compatibility macros to support older GTK+ versions */ + +#ifndef GTK_COMPAT_H +#define GTK_COMPAT_H + +#include <gtk/gtk.h> + +G_BEGIN_DECLS + + +/* GtkWidget */ +#if ! GTK_CHECK_VERSION(2, 18, 0) +# define compat_widget_set_flag(widget, flag, enable) \ + ((enable) ? GTK_WIDGET_SET_FLAGS((widget), (flag)) : GTK_WIDGET_UNSET_FLAGS((widget), (flag))) +# define gtk_widget_set_can_default(widget, can_default) \ + compat_widget_set_flag((widget), GTK_CAN_DEFAULT, (can_default)) +# define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL(widget) +# define gtk_widget_is_sensitive(widget) GTK_WIDGET_IS_SENSITIVE(widget) +# define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS(widget) +# define gtk_widget_get_sensitive(widget) GTK_WIDGET_SENSITIVE(widget) +# define gtk_widget_set_has_window(widget, has_window) \ + compat_widget_set_flag((widget), GTK_NO_WINDOW, !(has_window)) +# define gtk_widget_set_can_focus(widget, can_focus) \ + compat_widget_set_flag((widget), GTK_CAN_FOCUS, (can_focus)) +#endif +#if ! GTK_CHECK_VERSION(2, 20, 0) +# define gtk_widget_get_mapped(widget) GTK_WIDGET_MAPPED(widget) +#endif +#if ! GTK_CHECK_VERSION(3, 0, 0) +# define gtk_widget_get_allocated_height(widget) (((GtkWidget *) (widget))->allocation.height) +# define gtk_widget_get_allocated_width(widget) (((GtkWidget *) (widget))->allocation.width) +#endif + + +G_END_DECLS + +#endif /* GTK_COMPAT_H */ Modified: src/keybindings.c 11 files changed, 6 insertions(+), 5 deletions(-) =================================================================== @@ -56,6 +56,7 @@ #include "geanywraplabel.h" #include "main.h" #include "search.h" +#include "gtkcompat.h" #ifdef HAVE_VTE # include "vte.h" #endif @@ -1061,7 +1062,7 @@ static gboolean check_menu_key(GeanyDocument *doc, guint keyval, guint state, gu static gboolean on_menu_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer user_data) { - if (!GTK_WIDGET_SENSITIVE(widget)) + if (!gtk_widget_get_sensitive(widget)) gtk_widget_set_sensitive(GTK_WIDGET(widget), TRUE); return FALSE; } @@ -1488,7 +1489,7 @@ static gboolean cb_func_build_action(guint key_id) if (doc == NULL) return TRUE; - if (!GTK_WIDGET_IS_SENSITIVE(ui_lookup_widget(main_widgets.window, "menu_build1"))) + if (!gtk_widget_is_sensitive(ui_lookup_widget(main_widgets.window, "menu_build1"))) return TRUE; menu_items = build_get_menu_items(doc->file_type->id); @@ -1528,7 +1529,7 @@ static gboolean cb_func_build_action(guint key_id) /* Note: For Build menu items it's OK (at the moment) to assume they are in the correct * sensitive state, but some other menus don't update the sensitive status until * they are redrawn. */ - if (item && GTK_WIDGET_IS_SENSITIVE(item)) + if (item && gtk_widget_is_sensitive(item)) gtk_menu_item_activate(GTK_MENU_ITEM(item)); return TRUE; } @@ -1611,7 +1612,7 @@ static gboolean cb_func_switch_action(guint key_id) if (doc != NULL) { GtkWidget *sci = GTK_WIDGET(doc->editor->sci); - if (GTK_WIDGET_HAS_FOCUS(sci)) + if (gtk_widget_has_focus(sci)) ui_update_statusbar(doc, -1); else gtk_widget_grab_focus(sci); @@ -1841,7 +1842,7 @@ static gboolean cb_func_goto_action(guint key_id) GtkWidget *wid = toolbar_get_widget_child_by_name("GotoEntry"); /* use toolbar item if shown & not in the drop down overflow menu */ - if (wid && GTK_WIDGET_MAPPED(wid)) + if (wid && gtk_widget_get_mapped(wid)) { gtk_widget_grab_focus(wid); return TRUE; Modified: src/notebook.c 11 files changed, 6 insertions(+), 5 deletions(-) =================================================================== @@ -38,6 +38,7 @@ #include "utils.h" #include "keybindings.h" #include "main.h" +#include "gtkcompat.h" #define GEANY_DND_NOTEBOOK_TAB_TYPE "geany_dnd_notebook_tab" @@ -376,11 +377,11 @@ static gboolean is_position_on_tab_bar(GtkNotebook *notebook, GdkEventButton *ev case GTK_POS_TOP: case GTK_POS_BOTTOM: { - if (event->y >= 0 && event->y <= tab->allocation.height) + if (event->y >= 0 && event->y <= gtk_widget_get_allocated_height(tab)) { if (! gtk_notebook_show_arrows(notebook) || ( x > scroll_arrow_hlength && - x < nb->allocation.width - scroll_arrow_hlength)) + x < gtk_widget_get_allocated_width(nb) - scroll_arrow_hlength)) return TRUE; } break; @@ -388,11 +389,11 @@ static gboolean is_position_on_tab_bar(GtkNotebook *notebook, GdkEventButton *ev case GTK_POS_LEFT: case GTK_POS_RIGHT: { - if (event->x >= 0 && event->x <= tab->allocation.width) + if (event->x >= 0 && event->x <= gtk_widget_get_allocated_width(tab)) { if (! gtk_notebook_show_arrows(notebook) || ( y > scroll_arrow_vlength && - y < nb->allocation.height - scroll_arrow_vlength)) + y < gtk_widget_get_allocated_height(nb) - scroll_arrow_vlength)) return TRUE; } } @@ -666,7 +667,7 @@ gint notebook_new_tab(GeanyDocument *this) /* get button press events for the tab label and the space between it and * the close button, if any */ ebox = gtk_event_box_new(); - GTK_WIDGET_SET_FLAGS(ebox, GTK_NO_WINDOW); + gtk_widget_set_has_window(ebox, FALSE); g_signal_connect(ebox, "button-press-event", G_CALLBACK(notebook_tab_click), page); /* focus the current document after clicking on a tab */ g_signal_connect_after(ebox, "button-release-event", Modified: src/search.c 7 files changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -41,6 +41,7 @@ #include "keyfile.h" #include "stash.h" #include "toolbar.h" +#include "gtkcompat.h" #include <unistd.h> #include <string.h> @@ -551,7 +552,7 @@ void search_show_find_dialog(void) else { /* only set selection if the dialog is not already visible */ - if (! GTK_WIDGET_VISIBLE(find_dlg.dialog) && sel) + if (! gtk_widget_get_visible(find_dlg.dialog) && sel) gtk_entry_set_text(GTK_ENTRY(find_dlg.entry), sel); gtk_widget_grab_focus(find_dlg.entry); set_dialog_position(find_dlg.dialog, find_dlg.position); @@ -725,7 +726,7 @@ void search_show_replace_dialog(void) else { /* only set selection if the dialog is not already visible */ - if (! GTK_WIDGET_VISIBLE(replace_dlg.dialog) && sel) + if (! gtk_widget_get_visible(replace_dlg.dialog) && sel) gtk_entry_set_text(GTK_ENTRY(replace_dlg.find_entry), sel); if (sel != NULL) /* when we have a selection, reset the entry widget's background colour */ ui_set_search_entry_background(replace_dlg.find_entry, TRUE); @@ -1024,7 +1025,7 @@ void search_show_find_in_files_dialog(const gchar *dir) stash_group_display(fif_prefs, fif_dlg.dialog); /* only set selection if the dialog is not already visible, or has just been created */ - if (doc && ! sel && ! GTK_WIDGET_VISIBLE(fif_dlg.dialog)) + if (doc && ! sel && ! gtk_widget_get_visible(fif_dlg.dialog)) sel = editor_get_default_selection(doc->editor, search_prefs.use_current_word, NULL); entry = gtk_bin_get_child(GTK_BIN(fif_dlg.search_combo)); Modified: src/ui_utils.c 9 files changed, 5 insertions(+), 4 deletions(-) =================================================================== @@ -56,6 +56,7 @@ #include "main.h" #include "stash.h" #include "keyfile.h" +#include "gtkcompat.h" GeanyInterfacePrefs interface_prefs; @@ -2010,7 +2011,7 @@ void ui_swap_sidebar_pos(void) g_object_unref(left); g_object_unref(right); - gtk_paned_set_position(GTK_PANED(pane), pane->allocation.width + gtk_paned_set_position(GTK_PANED(pane), gtk_widget_get_allocated_width(pane) - gtk_paned_get_position(GTK_PANED(pane))); } @@ -2357,7 +2358,7 @@ static void on_auto_separator_item_show_hide(GtkWidget *widget, gpointer user_da { GeanyAutoSeparator *autosep = user_data; - if (GTK_WIDGET_VISIBLE(widget)) + if (gtk_widget_get_visible(widget)) autosep->ref_count++; else autosep->ref_count--; @@ -2369,7 +2370,7 @@ static void on_auto_separator_item_destroy(GtkWidget *widget, gpointer user_data { GeanyAutoSeparator *autosep = user_data; - /* GTK_WIDGET_VISIBLE won't work now the widget is being destroyed, + /* gtk_widget_get_visible() won't work now the widget is being destroyed, * so assume widget was visible */ autosep->ref_count--; autosep->ref_count = MAX(autosep->ref_count, 0); @@ -2388,7 +2389,7 @@ void ui_auto_separator_add_ref(GeanyAutoSeparator *autosep, GtkWidget *item) g_signal_connect(autosep->widget, "destroy", G_CALLBACK(gtk_widget_destroyed), &autosep->widget); - if (GTK_WIDGET_VISIBLE(item)) + if (gtk_widget_get_visible(item)) { autosep->ref_count++; auto_separator_update(autosep); Modified: src/vte.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -49,6 +49,7 @@ #include "geanywraplabel.h" #include "editor.h" #include "sciwrappers.h" +#include "gtkcompat.h" VteInfo vte_info; @@ -252,7 +253,7 @@ static void create_vte(void) vc->vte = vte = vf->vte_terminal_new(); scrollbar = gtk_vscrollbar_new(GTK_ADJUSTMENT(VTE_TERMINAL(vte)->adjustment)); - GTK_WIDGET_UNSET_FLAGS(scrollbar, GTK_CAN_FOCUS); + gtk_widget_set_can_focus(scrollbar, FALSE); /* create menu now so copy/paste shortcuts work */ vc->menu = vte_create_popup_menu(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3e649d: Prevent most GTK3 deprecation warnings that can't be fixed on GTK2
by Colomban Wendling 29 Jan '13

29 Jan '13

1 0

[geany/geany] 5ec0eb: Guard removed dialog separators on GTK3
by Colomban Wendling 29 Jan '13

29 Jan '13

1 0

[geany/geany] 484cc3: Add configure flag --enable-gtk3 to build against GTK 3.x
by Colomban Wendling 29 Jan '13

29 Jan '13

1 0

[geany/geany] c54639: Include keysyms compatibility header on GTK3
by Colomban Wendling 29 Jan '13

29 Jan '13

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2013