Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / gtk1 / win_gtk.h

diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h
index 4f79acfb7f0f04c565d346b5f6a9f0db0a84c527..78cbe0b531ae327c91656096207425be697c8b76 100644 (file)
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -1,5 +1,5 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////

-// Name:        win_gtk.h
+// Name:        wx/gtk1/win_gtk.h

 // Purpose:     wxWidgets's GTK base widget = GtkPizza
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxWidgets's GTK base widget = GtkPizza
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -19,9 +19,9 @@ extern "C" {
 #include <gdk/gdkx.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>

-#ifndef __WXGTK20__

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

-#endif
+
+#include "wx/dlimpexp.h"

 
 #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(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)


@@ -82,28 +82,37 @@ struct _GtkPizzaClass
                                      GtkAdjustment  *vadjustment);
 };
 
                                      GtkAdjustment  *vadjustment);
 };
 

+WXDLLIMPEXP_CORE

 GtkType    gtk_pizza_get_type        (void);
 GtkType    gtk_pizza_get_type        (void);

+WXDLLIMPEXP_CORE

 GtkWidget* gtk_pizza_new             (void);
 
 GtkWidget* gtk_pizza_new             (void);
 

+WXDLLIMPEXP_CORE

 void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
                                       GtkMyShadowType    type);
 
 void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
                                       GtkMyShadowType    type);
 

+WXDLLIMPEXP_CORE

 void       gtk_pizza_set_clear       (GtkPizza          *pizza,
                                       gboolean           clear);
 
 void       gtk_pizza_set_clear       (GtkPizza          *pizza,
                                       gboolean           clear);
 

+WXDLLIMPEXP_CORE

 void       gtk_pizza_set_filter      (GtkPizza          *pizza,
                                       gboolean           use);
 
 void       gtk_pizza_set_filter      (GtkPizza          *pizza,
                                       gboolean           use);
 

+WXDLLIMPEXP_CORE

 void       gtk_pizza_set_external    (GtkPizza          *pizza,
                                       gboolean           expose);
 
 void       gtk_pizza_set_external    (GtkPizza          *pizza,
                                       gboolean           expose);
 

+WXDLLIMPEXP_CORE

 void       gtk_pizza_scroll          (GtkPizza          *pizza,
                                       gint               dx,
                                       gint               dy);
 
 void       gtk_pizza_scroll          (GtkPizza          *pizza,
                                       gint               dx,
                                       gint               dy);
 

+WXDLLIMPEXP_CORE

 gint       gtk_pizza_child_resized   (GtkPizza          *pizza,
                                       GtkWidget         *widget);
 
 gint       gtk_pizza_child_resized   (GtkPizza          *pizza,
                                       GtkWidget         *widget);
 

+WXDLLIMPEXP_CORE

 void       gtk_pizza_put             (GtkPizza          *pizza,
                                       GtkWidget         *widget,
                                       gint               x,
 void       gtk_pizza_put             (GtkPizza          *pizza,
                                       GtkWidget         *widget,
                                       gint               x,


@@ -111,16 +120,19 @@ void       gtk_pizza_put             (GtkPizza          *pizza,
                                       gint               width,
                                       gint               height);
 
                                       gint               width,
                                       gint               height);
 

+WXDLLIMPEXP_CORE

 void       gtk_pizza_move            (GtkPizza          *pizza,
                                       GtkWidget         *widget,
                                       gint               x,
                                       gint               y );
 
 void       gtk_pizza_move            (GtkPizza          *pizza,
                                       GtkWidget         *widget,
                                       gint               x,
                                       gint               y );
 

+WXDLLIMPEXP_CORE

 void       gtk_pizza_resize          (GtkPizza          *pizza,
                                       GtkWidget         *widget,
                                       gint               width,
                                       gint               height );
 
 void       gtk_pizza_resize          (GtkPizza          *pizza,
                                       GtkWidget         *widget,
                                       gint               width,
                                       gint               height );
 

+WXDLLIMPEXP_CORE

 void       gtk_pizza_set_size        (GtkPizza          *pizza,
                                       GtkWidget         *widget,
                                       gint               x,
 void       gtk_pizza_set_size        (GtkPizza          *pizza,
                                       GtkWidget         *widget,
                                       gint               x,