remove the line for image.h, restore a line commented out by mistake

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

diff --git a/src/gtk/data.cpp b/src/gtk/data.cpp
index 96bce38d00f59dfacfe5db58b63f6ff5bf46bfd1..42e8ea70188fb7083c3233f2c28d238eb11da6ab 100644 (file)
--- a/src/gtk/data.cpp
+++ b/src/gtk/data.cpp
@@ -2,9 +2,8 @@
 // Name:        data.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -47,6 +46,9 @@ wxCursor *g_globalCursor = (wxCursor *) NULL;
 // Don't allow event propagation during drag
 bool g_blockEventsOnDrag = FALSE;
 
+// Don't allow mouse event propagation during scroll
+bool g_blockEventsOnScroll = FALSE;
+
 // Message Strings for Internationalization
 char **wx_msg_str = (char**)NULL;
 
@@ -122,6 +124,7 @@ wxBrush    wxNullBrush;
 wxFont     wxNullFont;
 wxColour   wxNullColour;
 wxPalette  wxNullPalette; 
+wxRegion   wxNullRegion; 
 
 // Default window names
 const char *wxButtonNameStr = "button";