Updates to match recent CVS changes.

[wxWidgets.git] / src / gtk1 / toplevel.cpp

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index f94dbeab591a24c6a1f19f2ed64ff8392007d3ad..a32d659c2f89a8eeb6cb1afe69d7ad7f6059b302 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -263,6 +263,7 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev
 // "draw" of m_client
 //-----------------------------------------------------------------------------
 
+#ifndef __WXGTK20__
 
 static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win )
 {
@@ -277,6 +278,8 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
                         0, 0, -1, -1);
 }
 
+#endif // GTK+ 1.x
+
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowGTK itself
 // ----------------------------------------------------------------------------
@@ -418,8 +421,10 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     // for m_mainWidget themes
     gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",
                 GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
+#ifndef __WXGTK20__
     gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
                 GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
+#endif
 
 #ifdef __WXDEBUG__
     debug_focus_in( m_mainWidget, wxT("wxTopLevelWindowGTK::m_mainWidget"), name );
@@ -845,9 +850,11 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
     wxTopLevelWindowBase::SetIcons( icons );
 
     DoSetIcon( icons.GetIcon( -1 ) );
-    if( window )
+    if ( window )
+    {
         wxSetIconsX11( (WXDisplay*)GDK_WINDOW_XDISPLAY( window ),
                        (WXWindow)GDK_WINDOW_XWINDOW( window ), icons );
+    }
 }
 
 // ----------------------------------------------------------------------------