Backgrounds work again

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

diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index bdb29ad1bd4c3c841b8d3fea980630510af6db30..96491de8ad601c45a03f8c69f4f18146dde18390 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -14,6 +14,9 @@
 #include "wx/dcscreen.h"
 #include "wx/window.h"
 
 #include "wx/dcscreen.h"
 #include "wx/window.h"
 

+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

 //-----------------------------------------------------------------------------
 // global data initialization
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // global data initialization
 //-----------------------------------------------------------------------------


@@ -123,7 +126,7 @@ gdk_window_transparent_new ( GdkWindow     *parent,
   gprivate->window_type = attributes->window_type;
   gprivate->extension_events = FALSE;
   
   gprivate->window_type = attributes->window_type;
   gprivate->extension_events = FALSE;
   

-#ifndef NEW_GTK_DND_CODE
+#if (GTK_MINOR_VERSION == 0)

   gprivate->dnd_drag_data_type = None;
   gprivate->dnd_drag_data_typesavail =
     gprivate->dnd_drop_data_typesavail = NULL;
   gprivate->dnd_drag_data_type = None;
   gprivate->dnd_drag_data_typesavail =
     gprivate->dnd_drop_data_typesavail = NULL;


@@ -212,7 +215,7 @@ gdk_window_transparent_new ( GdkWindow     *parent,
   if (attributes_mask & GDK_WA_TITLE)
     title = attributes->title;
   else
   if (attributes_mask & GDK_WA_TITLE)
     title = attributes->title;
   else

-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)

     title = "Unknown"; // GLH: Well I don't know for the moment what to write here.
 #else
     title = gdk_progname;
     title = "Unknown"; // GLH: Well I don't know for the moment what to write here.
 #else
     title = gdk_progname;


@@ -326,7 +329,7 @@ bool wxScreenDC::StartDrawingOnTop( wxRect *rect )
   
   if (sm_overlayWindow) gdk_window_show( sm_overlayWindow );
 
   
   if (sm_overlayWindow) gdk_window_show( sm_overlayWindow );
 

-  return (sm_overlayWindow);
+  return (sm_overlayWindow != NULL);

 }
 
 bool wxScreenDC::EndDrawingOnTop(void)
 }
 
 bool wxScreenDC::EndDrawingOnTop(void)