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

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index adb100078bd07c4af7f207d983227e07215ceeac..6bd073219b9e4ddab27118131436187ab0f6fc24 100644 (file)
--- 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__
 
 #ifndef __GTK_PIZZA_H__
 #define __GTK_PIZZA_H__
 

+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+

 #include <gdk/gdk.h>
 #include <gdk/gdk.h>

+#include <gdk/gdkx.h>

 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
 #ifndef __WXGTK20__
 #include <gtk/gtkfeatures.h>
 #endif
 
 #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 ())
 #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 adb100078bd07c4af7f207d983227e07215ceeac..6bd073219b9e4ddab27118131436187ab0f6fc24 100644 (file)
--- 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__
 
 #ifndef __GTK_PIZZA_H__
 #define __GTK_PIZZA_H__
 

+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+

 #include <gdk/gdk.h>
 #include <gdk/gdk.h>

+#include <gdk/gdkx.h>

 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
 #ifndef __WXGTK20__
 #include <gtk/gtkfeatures.h>
 #endif
 
 #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 ())
 #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 38d4d1e75fdbd68a27c8c32b2d11363a342cabb1..b27af26cf35b79205115caa4329c18d4d6eef085 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -33,13 +33,10 @@
 #endif
 
 #include <unistd.h>
 #endif
 
 #include <unistd.h>

+#include "wx/gtk/win_gtk.h"

 
 

-#include <glib.h>
-#include <gdk/gdk.h>

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

-#include <gdk/gdkx.h>

 
 

-#include "wx/gtk/win_gtk.h"

 
 //-----------------------------------------------------------------------------
 // global data
 
 //-----------------------------------------------------------------------------
 // global data

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 38d4d1e75fdbd68a27c8c32b2d11363a342cabb1..b27af26cf35b79205115caa4329c18d4d6eef085 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -33,13 +33,10 @@
 #endif
 
 #include <unistd.h>
 #endif
 
 #include <unistd.h>

+#include "wx/gtk/win_gtk.h"

 
 

-#include <glib.h>
-#include <gdk/gdk.h>

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

-#include <gdk/gdkx.h>

 
 

-#include "wx/gtk/win_gtk.h"

 
 //-----------------------------------------------------------------------------
 // global data
 
 //-----------------------------------------------------------------------------
 // global data