Cured BC++ makefile bug; wxGrid fix; updated Motif install.txt

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

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index 3159c410c07f45cbfb4cf21d769abd3b39ba8083..f0bc7c02de93879bb914486fdf96ebfd83185be8 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/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,
@@ -143,10 +143,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)