[Gnash-commit] gnash ChangeLog gui/gtk.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/03/10 12:18:51

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp 

Log message:
                * gui/gtk.cpp: change cursor only over the drawing area.
                  Prevents the mouse staying invisible over menus. Drop
                  a line I accidentally added some time ago.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5854&r2=1.5855
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.153&r2=1.154

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5854
retrieving revision 1.5855
diff -u -b -r1.5854 -r1.5855
--- ChangeLog   10 Mar 2008 10:32:08 -0000      1.5854
+++ ChangeLog   10 Mar 2008 12:18:49 -0000      1.5855
@@ -1,5 +1,11 @@
 2008-03-10 Benjamin Wolsey <address@hidden>
 
+       * gui/gtk.cpp: change cursor only over the drawing area.
+         Prevents the mouse staying invisible over menus. Drop
+         a line I accidentally added some time ago.
+
+2008-03-10 Benjamin Wolsey <address@hidden>
+
        * server/gnash.h: third time lucky: interfaceEventCallback
          returns a std::string to allow a range of responses.
        * gui/Player.{h,cpp}: adapt interfaceEventCallback method

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- gui/gtk.cpp 10 Mar 2008 10:32:09 -0000      1.153
+++ gui/gtk.cpp 10 Mar 2008 12:18:50 -0000      1.154
@@ -135,7 +135,6 @@
     // widgets are realized and before the configure event is fired.
     // TODO: find a way to make '_glue' use independent from actual renderer 
in use
     _glue->prepDrawingArea(_drawingArea);
-    gtk_container_set_reallocate_redraws(GTK_CONTAINER (_window), TRUE);
 #endif
 
     // Plugin
@@ -343,8 +342,7 @@
     }
 
     // The parent of _drawingArea is different for the plugin in fullscreen
-    gdk_window_set_cursor (gtk_widget_get_parent_window(_drawingArea),
-               gdkcursor);
+    gdk_window_set_cursor (_drawingArea->window, gdkcursor);
   
     if (gdkcursor) {
         gdk_cursor_unref(gdkcursor);
@@ -365,9 +363,7 @@
         GdkCursor* cursor = gdk_cursor_new_from_pixmap(pixmap, pixmap,
                                                     color, color, 0, 0);
 
-
-        gdk_window_set_cursor (gtk_widget_get_parent_window(_drawingArea),
-               cursor);
+        gdk_window_set_cursor (_drawingArea->window, cursor);
 
         g_free(color);
         g_object_unref(pixmap);