Native spline drawing.

[wxWidgets.git] / include / wx / gtk / control.h

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 0dd1153df7393b1631845e2441a019d4badfe94e..0bbe956798d41409cd5da81dfca6bf29d02697c2 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -23,13 +23,20 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxControl;
+class WXDLLIMPEXP_CORE wxControl;

 
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 

-class wxControl : public wxControlBase
+// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget
+extern "C" {
+    typedef GtkWidget* (*wxGtkWidgetNew_t)(void);
+    typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*);
+    typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*);
+}
+
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase

 {
 public:
     wxControl();
 {
 public:
     wxControl();


@@ -69,16 +76,16 @@ protected:
                                           bool useBase = false,
                                           int state = -1);
     static wxVisualAttributes
                                           bool useBase = false,
                                           int state = -1);
     static wxVisualAttributes

-        GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(void),
+        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t,

                                           bool useBase = false,
                                           int state = -1);
     static wxVisualAttributes
                                           bool useBase = false,
                                           int state = -1);
     static wxVisualAttributes

-        GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(const gchar*),
+        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t,

                                           bool useBase = false,
                                           int state = -1);
 
     static wxVisualAttributes
                                           bool useBase = false,
                                           int state = -1);
 
     static wxVisualAttributes

-        GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustment*),
+        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t,

                                           bool useBase = false,
                                           int state = -1);
 
                                           bool useBase = false,
                                           int state = -1);