Drop use of GTK2 API

plugins/classbuilder.c

@@ -494,7 +494,7 @@ static void show_dialog_create_class(gint type)
 		cc_dlg->base_header_entry = cc_table_attach_option_entry(table, _("Base source:"), row++);
 	else
 	{
-		hdr_hbox = gtk_hbox_new(FALSE, 6);
+		hdr_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 
 		label = cc_table_attach_option_label(table, _("Base header:"), row);
 

plugins/demoplugin.c

@@ -182,7 +182,7 @@ static GtkWidget *demo_configure(GeanyPlugin *plugin, GtkDialog *dialog, gpointe
 	GtkWidget *label, *entry, *vbox;
 
 	/* example configuration dialog */
-	vbox = gtk_vbox_new(FALSE, 6);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 
 	/* add a label and a text entry to the dialog */
 	label = gtk_label_new(_("Welcome text to show:"));

plugins/export.c

@@ -178,7 +178,7 @@ static void create_file_save_as_dialog(const gchar *extension, ExportFunc func,
 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
 
 	/* file chooser extra widget */
-	vbox = gtk_vbox_new(FALSE, 0);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), vbox);
 	{
 		GtkWidget *check_line_numbers;

plugins/filebrowser.c

@@ -942,7 +942,7 @@ static GtkWidget *make_filterbar(void)
 {
 	GtkWidget *label, *filterbar;
 
-	filterbar = gtk_hbox_new(FALSE, 1);
+	filterbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
 
 	label = gtk_label_new(_("Filter:"));
 
@@ -1133,7 +1133,7 @@ void plugin_init(GeanyData *data)
 
 	filter = NULL;
 
-	file_view_vbox = gtk_vbox_new(FALSE, 0);
+	file_view_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	toolbar = make_toolbar();
 	gtk_box_pack_start(GTK_BOX(file_view_vbox), toolbar, FALSE, FALSE, 0);
 
@@ -1261,8 +1261,8 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
 	GtkWidget *label, *entry, *checkbox_of, *checkbox_hf, *checkbox_fp, *checkbox_pb, *vbox;
 	GtkWidget *box, *align;
 
-	vbox = gtk_vbox_new(FALSE, 6);
-	box = gtk_vbox_new(FALSE, 3);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+	box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
 
 	label = gtk_label_new(_("External open command:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -1287,7 +1287,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
 	pref_widgets.show_hidden_checkbox = checkbox_hf;
 	g_signal_connect(checkbox_hf, "toggled", on_toggle_hidden, NULL);
 
-	box = gtk_vbox_new(FALSE, 3);
+	box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
 	checkbox_of = gtk_check_button_new_with_label(_("Hide file extensions:"));
 	gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_of), FALSE);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_of), hide_object_files);

plugins/saveactions.c

@@ -589,7 +589,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
 	GtkWidget *vbox, *label, *notebook_vbox, *checkbox_enable;
 	GtkWidget *notebook, *inner_vbox;
 
-	vbox = gtk_vbox_new(FALSE, 6);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 
 	notebook = gtk_notebook_new();
 	gtk_widget_set_can_focus(notebook, FALSE);
@@ -602,8 +602,8 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
 	{
 		GtkWidget *spin, *hbox, *checkbox, *checkbox_enable_as_lf, *radio1, *radio2;
 
-		notebook_vbox = gtk_vbox_new(FALSE, 2);
-		inner_vbox = gtk_vbox_new(FALSE, 5);
+		notebook_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+		inner_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 5);
 		gtk_box_pack_start(GTK_BOX(notebook_vbox), inner_vbox, TRUE, TRUE, 5);
 		gtk_notebook_insert_page(GTK_NOTEBOOK(notebook),
@@ -633,7 +633,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
 
 		label = gtk_label_new(_("seconds"));
 
-		hbox = gtk_hbox_new(FALSE, 5);
+		hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 		gtk_box_pack_start(GTK_BOX(hbox), spin, TRUE, TRUE, 0);
 		gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
@@ -670,8 +670,8 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
 		guint i;
 		const GSList *node;
 
-		notebook_vbox = gtk_vbox_new(FALSE, 2);
-		inner_vbox = gtk_vbox_new(FALSE, 5);
+		notebook_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+		inner_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 5);
 		gtk_box_pack_start(GTK_BOX(notebook_vbox), inner_vbox, TRUE, TRUE, 5);
 		gtk_notebook_insert_page(GTK_NOTEBOOK(notebook),
@@ -711,8 +711,8 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
 	{
 		GtkWidget *hbox, *entry_dir, *entry_time, *button, *image, *spin_dir_levels;
 
-		notebook_vbox = gtk_vbox_new(FALSE, 2);
-		inner_vbox = gtk_vbox_new(FALSE, 5);
+		notebook_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+		inner_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 5);
 		gtk_box_pack_start(GTK_BOX(notebook_vbox), inner_vbox, TRUE, TRUE, 5);
 		gtk_notebook_insert_page(GTK_NOTEBOOK(notebook),
@@ -742,7 +742,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
 		image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
 		gtk_container_add(GTK_CONTAINER(button), image);
 
-		hbox = gtk_hbox_new(FALSE, 6);
+		hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 		gtk_box_pack_start(GTK_BOX(hbox), entry_dir, TRUE, TRUE, 0);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
@@ -759,7 +759,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
 			gtk_entry_set_text(GTK_ENTRY(entry_time), backupcopy_time_fmt);
 		gtk_box_pack_start(GTK_BOX(inner_vbox), entry_time, FALSE, FALSE, 0);
 
-		hbox = gtk_hbox_new(FALSE, 6);
+		hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 
 		label = gtk_label_new_with_mnemonic(
 			_("Directory _levels to include in the backup destination:"));

plugins/splitwindow.c

@@ -339,13 +339,13 @@ static void split_view(gboolean horizontal)
 	g_object_ref(notebook);
 	gtk_container_remove(GTK_CONTAINER(parent), notebook);
 
-	pane = horizontal ? gtk_hpaned_new() : gtk_vpaned_new();
+	pane = gtk_paned_new(horizontal ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
 	gtk_container_add(GTK_CONTAINER(parent), pane);
 
 	gtk_container_add(GTK_CONTAINER(pane), notebook);
 	g_object_unref(notebook);
 
-	box = gtk_vbox_new(FALSE, 0);
+	box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	toolbar = create_toolbar();
 	gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0);
 	edit_window.vbox = box;

src/about.c

@@ -37,7 +37,7 @@
 #include "ui_utils.h"
 #include "utils.h"
 
-#include "gtkcompat.h"
+#include <gtk/gtk.h>
 
 #define HEADER "<span size=\"larger\" weight=\"bold\">Geany %s</span>"
 #define INFO "<span size=\"larger\" weight=\"bold\">%s</span>"
@@ -179,7 +179,7 @@ static GtkWidget *create_dialog(void)
 	/* create header */
 	header_eventbox = gtk_event_box_new();
 	gtk_widget_show(header_eventbox);
-	header_hbox = gtk_hbox_new(FALSE, 12);
+	header_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_container_set_border_width(GTK_CONTAINER(header_hbox), 4);
 	gtk_widget_show(header_hbox);
 	gtk_container_add(GTK_CONTAINER(header_eventbox), header_hbox);
@@ -205,7 +205,7 @@ static GtkWidget *create_dialog(void)
 	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), notebook, TRUE, TRUE, 0);
 
 	/* create "Info" tab */
-	info_box = gtk_vbox_new(FALSE, 0);
+	info_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(info_box), 6);
 	gtk_widget_show(info_box);
 
@@ -258,7 +258,7 @@ static GtkWidget *create_dialog(void)
 	gtk_widget_show(runtime_label);
 	gtk_box_pack_start(GTK_BOX(info_box), runtime_label, FALSE, FALSE, 0);
 
-	box = gtk_hbutton_box_new();
+	box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
 	url_button = gtk_button_new();
 	gtk_button_set_relief(GTK_BUTTON(url_button), GTK_RELIEF_NONE);
 	g_signal_connect(url_button, "clicked", G_CALLBACK(homepage_clicked), (gpointer)GEANY_HOMEPAGE);

src/build.c

@@ -50,13 +50,12 @@
 #include "vte.h"
 #include "win32.h"
 
-#include "gtkcompat.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
+#include <gtk/gtk.h>
 #include <glib/gstdio.h>
 
 
@@ -1967,7 +1966,7 @@ GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, BuildT
 		gtk_table_attach(table, label, col, col + 1, 0, 1,
 			GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding);
 	}
-	sep = gtk_hseparator_new();
+	sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
 	gtk_table_attach(table, sep, 0, DC_N_COL, 1, 2, GTK_FILL, GTK_FILL | GTK_EXPAND,
 		entry_x_padding, sep_padding);
 	if (ft != NULL && ft->id != GEANY_FILETYPES_NONE)
@@ -2006,7 +2005,7 @@ GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, BuildT
 	gtk_widget_set_sensitive(fields->fileregex, sensitivity);
 	gtk_widget_set_sensitive(clear, sensitivity);
 	++row;
-	sep = gtk_hseparator_new();
+	sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
 	gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND,
 		entry_x_padding, sep_padding);
 	++row;
@@ -2047,7 +2046,7 @@ GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, BuildT
 	gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND,
 		entry_x_padding, entry_y_padding);
 	++row;
-	sep = gtk_hseparator_new();
+	sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
 	gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND,
 		entry_x_padding, sep_padding);
 	++row;
@@ -2057,7 +2056,7 @@ GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, BuildT
 		entry_x_padding, entry_y_padding);
 	for (++row, cmd = 0; cmd < build_groups_count[GEANY_GBG_EXEC]; ++row, ++cmdindex, ++cmd)
 		fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GEANY_GBG_EXEC, cmd, TRUE);
-	sep = gtk_hseparator_new();
+	sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
 	gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND,
 		entry_x_padding, sep_padding);
 	++row;

src/dialogs.c

@@ -40,8 +40,7 @@
 #include "ui_utils.h"
 #include "win32.h"
 
-#include "gtkcompat.h"
-
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 
@@ -305,7 +304,7 @@ static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog)
 	GtkWidget *encoding_ebox, *encoding_label, *encoding_combo;
 
 	expander = gtk_expander_new_with_mnemonic(_("_More Options"));
-	vbox = gtk_vbox_new(FALSE, 6);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_add(GTK_CONTAINER(expander), vbox);
 
 	table = gtk_table_new(2, 4, FALSE);

src/document.c

@@ -3471,7 +3471,7 @@ static GtkWidget* document_show_message(GeanyDocument *doc, GtkMessageType msgty
 
 	g_signal_connect(info_widget, "response", G_CALLBACK(response_cb), doc);
 
-	hbox = gtk_hbox_new(FALSE, 12);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start(GTK_BOX(content_area), hbox, TRUE, TRUE, 0);
 
 	switch (msgtype)
@@ -3498,7 +3498,7 @@ static GtkWidget* document_show_message(GeanyDocument *doc, GtkMessageType msgty
 
 	if (extra_text)
 	{
-		GtkWidget *vbox = gtk_vbox_new(FALSE, 6);
+		GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 		GtkWidget *extra_label = geany_wrap_label_new(extra_text);
 
 		gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);

src/documentprivate.h

@@ -22,7 +22,7 @@
 #ifndef GEANY_DOCUMENT_PRIVATE_H
 #define GEANY_DOCUMENT_PRIVATE_H 1
 
-#include "gtkcompat.h"
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

src/filetypesprivate.h

@@ -24,7 +24,7 @@
 
 #include "build.h"
 
-#include "gtkcompat.h"
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

src/gb.c

@@ -24,7 +24,7 @@
 
 #include "utils.h"
 
-#include "gtkcompat.h"
+#include <gtk/gtk.h>
 
 
 #define AREA_SIZE 300
@@ -320,11 +320,11 @@ static void geany_pong_init(GeanyPong *self)
 	gtk_window_set_skip_pager_hint(GTK_WINDOW(self), TRUE);
 	gtk_window_set_resizable(GTK_WINDOW(self), FALSE);
 
-	vbox = gtk_vbox_new(FALSE, 0);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
 	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(self))), vbox, TRUE, TRUE, 0);
 
-	hbox = gtk_hbox_new(FALSE, 6);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new("Score:");

src/libmain.c

@@ -63,8 +63,6 @@
 #include "win32.h"
 #include "osx.h"
 
-#include "gtkcompat.h"
-
 #include <signal.h>
 #include <time.h>
 #include <sys/types.h>
@@ -73,6 +71,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <gtk/gtk.h>
 #include <glib/gstdio.h>
 
 #ifdef G_OS_UNIX

src/log.c

@@ -33,7 +33,7 @@
 #include "utils.h"
 #include "ui_utils.h"
 
-#include "gtkcompat.h"
+#include <gtk/gtk.h>
 
 #ifdef HAVE_LOCALE_H
 # include <locale.h>

src/navqueue.c

@@ -34,7 +34,7 @@
 #include "toolbar.h"
 #include "utils.h"
 
-#include "gtkcompat.h"
+#include <gtk/gtk.h>
 
 
 /* for the navigation history queue */

src/notebook.c

@@ -199,7 +199,7 @@ static GtkWidget *create_switch_dialog(void)
 	gtk_window_set_decorated(GTK_WINDOW(dialog), FALSE);
 	gtk_window_set_default_size(GTK_WINDOW(dialog), 200, -1);
 
-	vbox = gtk_vbox_new(FALSE, 6);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
 	gtk_container_add(GTK_CONTAINER(dialog), vbox);
 
@@ -679,7 +679,7 @@ gint notebook_new_tab(GeanyDocument *this)
 	g_return_val_if_fail(this != NULL, -1);
 
 	/* page is packed into a vbox so we can stack infobars above it */
-	vbox = gtk_vbox_new(FALSE, 0);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	page = GTK_WIDGET(this->editor->sci);
 	gtk_box_pack_start(GTK_BOX(vbox), page, TRUE, TRUE, 0);
 
@@ -694,7 +694,7 @@ gint notebook_new_tab(GeanyDocument *this)
 	g_signal_connect_after(ebox, "button-release-event",
 		G_CALLBACK(focus_sci), NULL);
 
-	hbox = gtk_hbox_new(FALSE, 2);
+	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
 	gtk_box_pack_start(GTK_BOX(hbox), this->priv->tab_label, FALSE, FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(ebox), hbox);
 

src/pluginprivate.h

@@ -26,8 +26,6 @@
 #include "ui_utils.h"	/* GeanyAutoSeparator */
 #include "keybindings.h"	/* GeanyKeyGroup */
 
-#include "gtkcompat.h"
-
 
 G_BEGIN_DECLS