Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

missing extern "C" added to fix linking problems with some GTK+ versions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-10-02 19:28:23 +00:00
parent 447f908aff
commit e8106239b2
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/gtk/win_gtk.h
View File

@@ -11,17 +11,18 @@
#ifndef __GTK_PIZZA_H__ #ifndef __GTK_PIZZA_H__
#define __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/gtkcontainer.h>
#include <gtk/gtkadjustment.h> #include <gtk/gtkadjustment.h>
#ifndef __WXGTK20__ #ifndef __WXGTK20__
#include <gtk/gtkfeatures.h> #include <gtk/gtkfeatures.h>
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define GTK_PIZZA(obj) GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza) #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_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_IS_PIZZA(obj) GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())

9
include/wx/gtk1/win_gtk.h
View File

@@ -11,17 +11,18 @@
#ifndef __GTK_PIZZA_H__ #ifndef __GTK_PIZZA_H__
#define __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/gtkcontainer.h>
#include <gtk/gtkadjustment.h> #include <gtk/gtkadjustment.h>
#ifndef __WXGTK20__ #ifndef __WXGTK20__
#include <gtk/gtkfeatures.h> #include <gtk/gtkfeatures.h>
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define GTK_PIZZA(obj) GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza) #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_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_IS_PIZZA(obj) GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())

9
src/gtk/app.cpp
View File

@@ -33,14 +33,11 @@
#endif #endif
#include <unistd.h> #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 "wx/gtk/win_gtk.h"
#include <gtk/gtk.h>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

9
src/gtk1/app.cpp
View File

@@ -33,14 +33,11 @@
#endif #endif
#include <unistd.h> #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 "wx/gtk/win_gtk.h"
#include <gtk/gtk.h>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------