--- a/src/sys_GTK.h
+++ b/src/sys_GTK.h
@@ -156,18 +156,18 @@
    gtk_table_attach(GTK_TABLE(table), sep, left, right, top, bottom,					\
 		GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
 
-#define MAKE_BFRAME( label, left, right, top, bottom, number)							\
-	frame = gtk_frame_new(label);													\
-		gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);				\
-		gtk_container_set_border_width(GTK_CONTAINER(frame), 2);						\
-		gtk_table_attach(GTK_TABLE(table), frame, left, right, top, bottom,				\
-						 GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);						\
-		box = gtk_vbox_new(FALSE, number);												\
-		gtk_container_set_border_width(GTK_CONTAINER(box), 5);							\
-		gtk_container_add(GTK_CONTAINER(frame), box);									\
-		gtk_widget_show (box);															\
-		gtk_widget_show (frame);														\
-		group = NULL;
+#define MAKE_BFRAME(table, label, left, right, top, bottom, number)						\
+	frame = gtk_frame_new(label);														\
+	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);					\
+	gtk_container_set_border_width(GTK_CONTAINER(frame), 2);							\
+	gtk_table_attach(GTK_TABLE(table), frame, left, right, top, bottom,					\
+					 GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);							\
+	box = gtk_vbox_new(FALSE, number);													\
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);								\
+	gtk_container_add(GTK_CONTAINER(frame), box);										\
+	gtk_widget_show (box);																\
+	gtk_widget_show (frame);															\
+	group = NULL;
 
 #define	  NUMRES	30
 
@@ -317,7 +317,7 @@
 																						\
 	MAKE_TEXTLABEL(_("HFoV:"),			table, 0, 1, 2, 3);								\
 	MAKE_TEXTLABEL(_("VFoV:"),			table, 2, 3, 2, 3);								\
-	MAKE_BFRAME(_("From:"), 0, 2, 1, 2,	6);												\
+	MAKE_BFRAME(table, _("From:"), 0, 2, 1, 2,	6);										\
 	MAKE_RADIO_BUTTON( kSetRemapPrefs_InRect,		 _("Normal") )						\
 	MAKE_RADIO_BUTTON( kSetRemapPrefs_InPano,		 _("QTVR") )						\
 	MAKE_RADIO_BUTTON( kSetRemapPrefs_InErect,		 _("PSphere") )						\
@@ -325,7 +325,7 @@
 	MAKE_RADIO_BUTTON( kSetRemapPrefs_InSphereCenter,_("Fisheye vert."))				\
 	MAKE_RADIO_BUTTON( kSetRemapPrefs_InMirror,		 _("Convex mirror"))				\
 																						\
-	MAKE_BFRAME(_("To:"), 2, 4, 1, 2, 6);												\
+	MAKE_BFRAME(table, _("To:"), 2, 4, 1, 2, 6);										\
 	MAKE_RADIO_BUTTON( kSetRemapPrefs_OutRect,		  _("Normal") )						\
 	MAKE_RADIO_BUTTON( kSetRemapPrefs_OutPano,		  _("QTVR") )						\
 	MAKE_RADIO_BUTTON( kSetRemapPrefs_OutErect,		  _("PSphere") )					\
@@ -590,7 +590,7 @@
 	MAKE_TEXT_WID( kSetRadialOptions_Blue2 ,	2, 3, 3, 4 );			\
 	MAKE_TEXT_WID( kSetRadialOptions_Blue3 ,	1, 2, 3, 4 );			\
 																		\
-	MAKE_BFRAME(_("Correction mode:"), 0, 4, 4, 5, 3);					\
+	MAKE_BFRAME(table, _("Correction mode:"), 0, 4, 4, 5, 3);			\
 	MAKE_RADIO_BUTTON( kSetRadialOptions_radial,	 _("Radial") )		\
 	MAKE_RADIO_BUTTON( kSetRadialOptions_horizontal, _("Horizontal") )	\
 	MAKE_RADIO_BUTTON( kSetRadialOptions_vertical,	 _("Vertical") )	\
@@ -651,7 +651,7 @@
 	pt_help_connect(dlg, "panToolAdjust");								\
 	MAKE_TABLE(2, 2);													\
 																		\
-	MAKE_BFRAME(_("Action:"), 0, 1, 1, 2, 5);							\
+	MAKE_BFRAME(table, _("Action:"), 0, 1, 1, 2, 5);					\
 	MAKE_RADIO_BUTTON( kSetAdjustPrefs_Insert,		 _("Insert into panorama") )		\
 	MAKE_RADIO_BUTTON( kSetAdjustPrefs_Extract,		 _("Extract from panorama") )		\
 	MAKE_RADIO_BUTTON( kSetAdjustPrefs_SetCtrlPts,	 _("Read marked controlpoints") )	\
@@ -748,7 +748,7 @@
 		gtk_container_set_border_width(GTK_CONTAINER(ftable), 2);			\
 		gtk_container_add(GTK_CONTAINER(frame), ftable);					\
 		gtk_widget_show(ftable);											\
-		MAKE_BFRAME(_("Format:"), 2, 3, 0, 4, 5);							\
+		MAKE_BFRAME(ftable, _("Format:"), 2, 3, 0, 4, 5);					\
 		MAKE_RADIO_BUTTON( kSetCreateOptions_ImR,  _("Rectilinear"))		\
 		MAKE_RADIO_BUTTON( kSetCreateOptions_ImP,  _("Panoramic"))			\
 		MAKE_RADIO_BUTTON( kSetCreateOptions_ImFf, _("Fisheye fullfr."))	\
@@ -779,7 +779,7 @@
 		gtk_container_set_border_width(GTK_CONTAINER(ftable), 2);			\
 		gtk_container_add(GTK_CONTAINER(frame), ftable);					\
 		gtk_widget_show(ftable);											\
-		MAKE_BFRAME(_("Format:"), 2, 3, 0, 3, 3);							\
+		MAKE_BFRAME(ftable, _("Format:"), 2, 3, 0, 3, 3);					\
 		MAKE_RADIO_BUTTON( kSetCreateOptions_PRe, _("Rectilinear"))			\
 		MAKE_RADIO_BUTTON( kSetCreateOptions_PPa, _("QTVR-Panorama"))		\
 		MAKE_RADIO_BUTTON( kSetCreateOptions_PSp, _("PSphere"))				\
@@ -833,7 +833,7 @@
 		MAKE_RADIO_BUTTON(kSetCreateOptions_SPaste,	 _("paste"))			\
 		MAKE_TEXTLABEL(_("Feather:"),		ftable, 0, 1, 3, 4);			\
 		MAKE_FTEXT_WID( kSetCreateOptions_SF ,		1, 2, 3, 4 );			\
-		MAKE_BFRAME(_("Color Adjustment:"), 2, 4, 0, 4, 4);					\
+		MAKE_BFRAME(ftable, _("Color Adjustment:"), 2, 4, 0, 4, 4);			\
 		MAKE_RADIO_BUTTON(kSetCreateOptions_SIm,   _("Image"))				\
 		MAKE_RADIO_BUTTON(kSetCreateOptions_SBuf,  _("Buffer"))				\
 		MAKE_RADIO_BUTTON(kSetCreateOptions_Sboth, _("Both"))				\
@@ -859,14 +859,14 @@
 	MAKE_TEXTLABEL(_("<- Faster"),		table, 2, 3, 1, 2);			\
 	MAKE_TEXTLABEL(_("Better ->"),		table, 2, 3, 2, 3);			\
 																	\
-	MAKE_BFRAME(_("Use Algorithm:"), 0, 2, 0, 4, 5);				\
+	MAKE_BFRAME(table, _("Use Algorithm:"), 0, 2, 0, 4, 5);			\
 	MAKE_RADIO_BUTTON( kPoly,	  _("Polynomial 16 pixels"))		\
 	MAKE_RADIO_BUTTON( kSp16,	  _("Spline		16 pixels"))		\
 	MAKE_RADIO_BUTTON( kSp36,	  _("Spline		36 pixels"))		\
 	MAKE_RADIO_BUTTON( kSinc256,  _("Sinc		256 pixels"))		\
 	MAKE_RADIO_BUTTON( kSinc1024, _("Sinc		1024 pixels"))		\
 																	\
-	MAKE_BFRAME(_("Interpolation speed:"), 0, 2, 4, 5, 3);			\
+	MAKE_BFRAME(table, _("Interpolation speed:"), 0, 2, 4, 5, 3);	\
 	MAKE_RADIO_BUTTON( kIntrpNorm, _("Normal") )					\
 	MAKE_RADIO_BUTTON( kIntrpMed,  _("Medium") )					\
 	MAKE_RADIO_BUTTON( kIntrpFast, _("Fast") )						\
@@ -882,7 +882,7 @@
 	pt_help_connect(dlg, "useSetPrefs");										\
 	MAKE_TABLE(2, 2);															\
 																				\
-	MAKE_BFRAME(_("If source and result size differ:"), 0, 1, 0, 2, 2);			\
+	MAKE_BFRAME(table, _("If source and result size differ:"), 0, 1, 0, 2, 2);	\
 	MAKE_RADIO_BUTTON( kSetSizePrefs_Crop, _("Display cropped/framed image"))	\
 	MAKE_RADIO_BUTTON( kSetSizePrefs_SFile, _("Resize image"))					\
 																				\