[Geany-Devel] [PATCH geany-plugins 05/10] geanymacro: Fix GTK+3 support

[Quentin Glidic]

From: Quentin Glidic <sardemff7+git at sardemff7.net>

Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
---
 build/geanymacro.m4         |  1 -
 geanymacro/src/geanymacro.c | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build/geanymacro.m4 b/build/geanymacro.m4
index 7146ac8..99cba3c 100644
--- a/build/geanymacro.m4
+++ b/build/geanymacro.m4
@@ -1,7 +1,6 @@
 AC_DEFUN([GP_CHECK_GEANYMACRO],
 [
     GP_ARG_DISABLE([GeanyMacro], [auto])
-    GP_CHECK_PLUGIN_GTK2_ONLY([GeanyMacro])
     GP_COMMIT_PLUGIN_STATUS([GeanyMacro])
     AC_CONFIG_FILES([
         geanymacro/Makefile
diff --git a/geanymacro/src/geanymacro.c b/geanymacro/src/geanymacro.c
index e6aa80e..2f46226 100644
--- a/geanymacro/src/geanymacro.c
+++ b/geanymacro/src/geanymacro.c
@@ -901,7 +901,7 @@ NULL);
 								GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_add_with_viewport((GtkScrolledWindow*)scroll,label);
 
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),scroll);
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),scroll);
 	gtk_widget_show(scroll);
 
 	/* set dialog size (leave width default) */
@@ -1065,7 +1065,7 @@ static gboolean InitializeMacroRecord(void)
 
 	/* create box to hold macro trigger entry box and label */
 	hbox=gtk_hbox_new(FALSE,0);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),hbox);
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),hbox);
 	gtk_widget_show(hbox);
 
 	gtkl=gtk_label_new(_("Macro Trigger:"));
@@ -1079,7 +1079,7 @@ static gboolean InitializeMacroRecord(void)
 
 	/* create box to hold macro name entry box, and label */
 	hbox=gtk_hbox_new(FALSE,0);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),hbox);
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),hbox);
 	gtk_widget_show(hbox);
 
 	gtkl=gtk_label_new(_("Macro Name:"));
@@ -1395,7 +1395,7 @@ static void EditSearchOptions(GtkTreeModel *model,GtkTreeIter *iter)
 
 	/* create box to hold widgets */
 	vbox=gtk_vbox_new(FALSE, 6);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),vbox);
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),vbox);
 	gtk_widget_show(vbox);
 
 	/* create combobox to hold search direction */
@@ -1538,7 +1538,7 @@ static void EditSCIREPLACESELText(GtkTreeModel *model,GtkTreeIter *iter)
 
 	/* create box to hold macro name entry box, and label */
 	hbox=gtk_hbox_new(FALSE,0);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),hbox);
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),hbox);
 	gtk_widget_show(hbox);
 
 	gtkl=gtk_label_new(_("Text:"));
@@ -1808,8 +1808,8 @@ static void EditMacroElements(Macro *m)
 	                            GTK_SELECTION_SINGLE);
 
 	/* add table to dialog */
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),table);
-/*	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),table,FALSE,FALSE,2);*/
+	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table);
+/*	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table,FALSE,FALSE,2);*/
 	gtk_widget_show(table);
 
 	/* add buttons */
@@ -2109,7 +2109,7 @@ static void DoEditMacro(GtkMenuItem *menuitem, gpointer gdata)
 	                            GTK_SELECTION_SINGLE);
 
 	/* add table to dialog */
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),table,FALSE,FALSE,2);
+	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),table,FALSE,FALSE,2);
 	gtk_widget_show(table);
 
 	/* add buttons */
-- 
1.8.2