From e8106239b2b0966495cd5bb036a64e36796c21d5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 2 Oct 2001 19:28:23 +0000
Subject: [PATCH] missing extern "C" added to fix linking problems with some
 GTK+ versions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/gtk/win_gtk.h  | 9 +++++----
 include/wx/gtk1/win_gtk.h | 9 +++++----
 src/gtk/app.cpp           | 9 +++------
 src/gtk1/app.cpp          | 9 +++------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index adb100078b..6bd073219b 100644
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -11,17 +11,18 @@
 #ifndef __GTK_PIZZA_H__
 #define __GTK_PIZZA_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
 #ifndef __WXGTK20__
 #include <gtk/gtkfeatures.h>
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
 #define GTK_PIZZA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_pizza_get_type (), GtkPizzaClass)
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())
diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h
index adb100078b..6bd073219b 100644
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -11,17 +11,18 @@
 #ifndef __GTK_PIZZA_H__
 #define __GTK_PIZZA_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
 #ifndef __WXGTK20__
 #include <gtk/gtkfeatures.h>
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
 #define GTK_PIZZA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_pizza_get_type (), GtkPizzaClass)
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())
diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 38d4d1e75f..b27af26cf3 100644
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -33,14 +33,11 @@
 #endif
 
 #include <unistd.h>
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
 #include "wx/gtk/win_gtk.h"
 
+#include <gtk/gtk.h>
+
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 38d4d1e75f..b27af26cf3 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -33,14 +33,11 @@
 #endif
 
 #include <unistd.h>
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
 #include "wx/gtk/win_gtk.h"
 
+#include <gtk/gtk.h>
+
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------