Added wxMiniFrame

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

diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index 3159c410c07f45cbfb4cf21d769abd3b39ba8083..4bab18b3795c48549117ccc45ee8ed865fa1c31e 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -34,8 +34,8 @@ extern "C" {
 #include "gdk/gdkx.h"
 #include <netinet/in.h>
 
-int nevent_masks = 17;
-int event_mask_table[19] =
+int my_nevent_masks = 17;
+int my_event_masks_table[19] =
 {
   ExposureMask,
   PointerMotionMask,
@@ -122,6 +122,8 @@ gdk_window_transparent_new ( GdkWindow     *parent,
   gprivate->height = (attributes->height > 1) ? (attributes->height) : (1);
   gprivate->window_type = attributes->window_type;
   gprivate->extension_events = FALSE;
+  
+#ifndef NEW_GTK_DND_CODE
   gprivate->dnd_drag_data_type = None;
   gprivate->dnd_drag_data_typesavail =
     gprivate->dnd_drop_data_typesavail = NULL;
@@ -130,6 +132,7 @@ gdk_window_transparent_new ( GdkWindow     *parent,
     gprivate->dnd_drop_data_numtypesavail =
     gprivate->dnd_drag_data_numtypesavail = 0;
   gprivate->dnd_drag_eventmask = gprivate->dnd_drag_savedeventmask = 0;
+#endif
 
   gprivate->filters = NULL;
   gprivate->children = NULL;
@@ -143,10 +146,10 @@ gdk_window_transparent_new ( GdkWindow     *parent,
   xvisual = ((GdkVisualPrivate*) visual)->xvisual;
 
   xattributes.event_mask = StructureNotifyMask;
-  for (i = 0; i < nevent_masks; i++)
+  for (i = 0; i < my_nevent_masks; i++)
     {
       if (attributes->event_mask & (1 << (i + 1)))
-       xattributes.event_mask |= event_mask_table[i];
+       xattributes.event_mask |= my_event_masks_table[i];
     }
 
   if (xattributes.event_mask)
@@ -280,7 +283,7 @@ bool wxScreenDC::StartDrawingOnTop( wxWindow *window )
   window->GetSize( &w, &h );
   window->ClientToScreen( &x, &y );
   
-  wxRectangle rect;
+  wxRect rect;
   rect.x = x;
   rect.y = y;
   rect.width = 0;
@@ -289,7 +292,7 @@ bool wxScreenDC::StartDrawingOnTop( wxWindow *window )
   return StartDrawingOnTop( &rect );
 }
 
-bool wxScreenDC::StartDrawingOnTop( wxRectangle *rect )
+bool wxScreenDC::StartDrawingOnTop( wxRect *rect )
 {
   int x = 0;
   int y = 0;