From ef44e19afb631692974e5e0fb6f9e4b245143cab Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Tue, 9 Aug 2011 15:05:47 +0000
Subject: [PATCH] gtk3 minor improvement

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1791 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 bindings/gtk3/gtk/gtkwindow.inc | 19 ++-----------------
 bindings/gtk3/gtk3.pas          | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/bindings/gtk3/gtk/gtkwindow.inc b/bindings/gtk3/gtk/gtkwindow.inc
index fe9d8bae0..f0080d6c2 100644
--- a/bindings/gtk3/gtk/gtkwindow.inc
+++ b/bindings/gtk3/gtk/gtkwindow.inc
@@ -27,8 +27,6 @@
 {$ifndef __GTK_WINDOW_H__}
 {$define __GTK_WINDOW_H__}
 
-{$ifdef GTK_HEADER}
-
 {$include gtkapplication.inc}
 {$include gtkaccelgroup.inc}
 {$include gtkbin.inc}
@@ -36,11 +34,11 @@
 //G_BEGIN_DECLS
 
 function GTK_TYPE_WINDOW(): GType;
-#define GTK_WINDOW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow))
+{#define GTK_WINDOW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow))
 #define GTK_WINDOW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW, GtkWindowClass))
 #define GTK_IS_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW))
 #define GTK_IS_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW))
-#define GTK_WINDOW_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass))
+#define GTK_WINDOW_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass))}
 
 typedef struct _GtkWindowPrivate      GtkWindowPrivate;
 typedef struct _GtkWindowClass        GtkWindowClass;
@@ -334,17 +332,4 @@ gboolean gtk_window_get_resize_grip_area   (GtkWindow    *window,
 
 //G_END_DECLS
 
-{$else GTK_HEADER}
-
-function GTK_TYPE_WINDOW(): GType;
-begin
-  Result := gtk_window_get_type();
-end;
-#define GTK_WINDOW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow))
-#define GTK_WINDOW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW, GtkWindowClass))
-#define GTK_IS_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW))
-#define GTK_IS_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW))
-#define GTK_WINDOW_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass))
-
-{$endif GTK_HEADER}
 {$endif} { __GTK_WINDOW_H__ }
diff --git a/bindings/gtk3/gtk3.pas b/bindings/gtk3/gtk3.pas
index d35d8333c..f37c5c902 100644
--- a/bindings/gtk3/gtk3.pas
+++ b/bindings/gtk3/gtk3.pas
@@ -33,8 +33,6 @@ uses gdk3;
 
 const gtk3lib = 'libgtk+3.0';
 
-{$define GTK_HEADER}
-
 {#include <gtk/gtkaboutdialog.h>
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkaccellabel.h>
@@ -239,4 +237,17 @@ const gtk3lib = 'libgtk+3.0';
 
 implementation
 
+{ gtkwindow.inc }
+
+function GTK_TYPE_WINDOW(): GType;
+begin
+  Result := gtk_window_get_type();
+end;
+
+{#define GTK_WINDOW(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow))
+#define GTK_WINDOW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW, GtkWindowClass))
+#define GTK_IS_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW))
+#define GTK_IS_WINDOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW))
+#define GTK_WINDOW_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass))}
+
 end.