removed #errors in 2.7 compilation

[wxWidgets.git] / src / gtk / control.cpp

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index da63b425be45a95111b1360e7057b9470611a828..afcd65c371cddc79074d76b6718b2854bfdc17c3 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "control.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -231,41 +227,50 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
 
 //static
 wxVisualAttributes
 
 //static
 wxVisualAttributes

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

                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;
                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;

+    // NB: we need toplevel window so that GTK+ can find the right style
+    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);

     GtkWidget* widget = widget_new();
     GtkWidget* widget = widget_new();

+    gtk_container_add(GTK_CONTAINER(wnd), widget);

     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);

-    gtk_widget_destroy(widget);
+    gtk_widget_destroy(wnd);

     return attr;
 }
 
 //static
 wxVisualAttributes
     return attr;
 }
 
 //static
 wxVisualAttributes

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

                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;
                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;

+    // NB: we need toplevel window so that GTK+ can find the right style
+    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);

     GtkWidget* widget = widget_new("");
     GtkWidget* widget = widget_new("");

+    gtk_container_add(GTK_CONTAINER(wnd), widget);

     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);

-    gtk_widget_destroy(widget);
+    gtk_widget_destroy(wnd);

     return attr;
 }
 
 
 //static
 wxVisualAttributes
     return attr;
 }
 
 
 //static
 wxVisualAttributes

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

                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;
                                              bool useBase,
                                              int state)
 {
     wxVisualAttributes attr;

+    // NB: we need toplevel window so that GTK+ can find the right style
+    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);

     GtkWidget* widget = widget_new(NULL);
     GtkWidget* widget = widget_new(NULL);

+    gtk_container_add(GTK_CONTAINER(wnd), widget);

     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);
     attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state);

-    gtk_widget_destroy(widget);
+    gtk_widget_destroy(wnd);

     return attr;
 }
 
     return attr;
 }