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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/09/25 18:08:28

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp 

Log message:
        Change Oslash to Ooblique to stop breaking some gtk versions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4408&r2=1.4409
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.113&r2=1.114

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4408
retrieving revision 1.4409
diff -u -b -r1.4408 -r1.4409
--- ChangeLog   25 Sep 2007 16:03:25 -0000      1.4408
+++ ChangeLog   25 Sep 2007 18:08:28 -0000      1.4409
@@ -1,3 +1,8 @@
+2007-09-26 Benjamin Wolsey <address@hidden>
+
+       * gui/gtk.cpp: change Oslash to Ooblique - GDK_Oslash is evidently
+         not defined in all gtk-2.0 versions.
+
 2007-09-26 Chad Musick <address@hidden>
 
        * server/vm/ActionExec.cpp: If the stack is empty, there was not

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- gui/gtk.cpp 25 Sep 2007 09:44:45 -0000      1.113
+++ gui/gtk.cpp 25 Sep 2007 18:08:28 -0000      1.114
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.113 2007/09/25 09:44:45 bwy Exp $ */
+/* $Id: gtk.cpp,v 1.114 2007/09/25 18:08:28 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1394,11 +1394,11 @@
         c = (gnash::key::code) ((key - GDK_nobreakspace) + 
gnash::key::NOBREAKSPACE); 
     }
 
-    else if (key >= GDK_Ntilde && key <= GDK_Oslash ) {
+    else if (key >= GDK_Ntilde && key <= GDK_Ooblique ) {
         c = (gnash::key::code) ((key - GDK_Ntilde) + gnash::key::NTILDE);
     } else if (key >= GDK_Ugrave && key <= GDK_THORN) {
         c = (gnash::key::code) ((key - GDK_Ugrave) + gnash::key::UGRAVE);
-    } else if (key >= GDK_ssharp && key <= GDK_oslash) {
+    } else if (key >= GDK_ssharp && key <= GDK_ooblique) {
         c = (gnash::key::code) ((key - GDK_ssharp) + gnash::key::sSHARP);
     } else if (key >= GDK_ugrave && key <= GDK_ydiaeresis) {
         c = (gnash::key::code) ((key - GDK_ugrave) + gnash::key::uGRAVE);