X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0208334d5d57849d7e46b9997cd8ef39daf39d2d..b2b3ccc524ad5024fac46a40cd3639ebe7cc0de4:/src/gtk1/dcscreen.cpp?ds=sidebyside diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp index f0bc7c02de..4bab18b379 100644 --- a/src/gtk1/dcscreen.cpp +++ b/src/gtk1/dcscreen.cpp @@ -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; @@ -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;