ambiguous ctor call resolved

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 1cc1b40434972962de461bff551aa0f74b5cf33b..5b0eb48f98d048b9737a53170aa069944fe507bf 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -146,7 +146,7 @@ static guint32 gs_timeLastClick = 0;
 
 static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
                                          GdkEvent *WXUNUSED(event),
 
 static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
                                          GdkEvent *WXUNUSED(event),

-                                         const wxChar *name )
+                                         const wxChar *WXUNUSED(name) )

 {
 /*
     static bool s_done = FALSE;
 {
 /*
     static bool s_done = FALSE;


@@ -2268,7 +2268,9 @@ void wxWindow::DoSetClientSize( int width, int height )
             if (HasScrolling())
             {
                 GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
             if (HasScrolling())
             {
                 GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);

+#if 0 // unused - if this is ok, just remove this line (VZ)

                 GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
                 GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );

+#endif // 0

 
                 GtkWidget *viewport = scroll_window->viewport;
                 GtkStyleClass *viewport_class = viewport->style->klass;
 
                 GtkWidget *viewport = scroll_window->viewport;
                 GtkStyleClass *viewport_class = viewport->style->klass;


@@ -2335,7 +2337,9 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
             if (HasScrolling())
             {
                 GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
             if (HasScrolling())
             {
                 GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);

+#if 0 // unused - if this is ok, just remove this line (VZ)

                 GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
                 GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );

+#endif // 0

 
                 GtkWidget *viewport = scroll_window->viewport;
                 GtkStyleClass *viewport_class = viewport->style->klass;
 
                 GtkWidget *viewport = scroll_window->viewport;
                 GtkStyleClass *viewport_class = viewport->style->klass;