[Gnash-commit] gnash/gui fb.cpp sdl.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  08/03/25 08:58:26

Modified files:
        gui            : fb.cpp sdl.cpp 

Log message:
        MOD_ -> GNASH_MOD_

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fb.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.64&r2=1.65

Patches:
Index: fb.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fb.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- fb.cpp      27 Feb 2008 08:51:54 -0000      1.50
+++ fb.cpp      25 Mar 2008 08:58:25 -0000      1.51
@@ -1404,16 +1404,16 @@
       
         // build modifier
       
-        int modifier = gnash::key::MOD_NONE;
+        int modifier = gnash::key::GNASH_MOD_NONE;
         
         if (keyb_lshift || keyb_rshift)
-          modifier = modifier | gnash::key::MOD_SHIFT;
+          modifier = modifier | gnash::key::GNASH_MOD_SHIFT;
 
         if (keyb_lctrl || keyb_rctrl)
-          modifier = modifier | gnash::key::MOD_CONTROL;
+          modifier = modifier | gnash::key::GNASH_MOD_CONTROL;
 
         if (keyb_lalt || keyb_ralt)
-          modifier = modifier | gnash::key::MOD_ALT;
+          modifier = modifier | gnash::key::GNASH_MOD_ALT;
           
           
         // send event

Index: sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- sdl.cpp     5 Mar 2008 03:55:52 -0000       1.64
+++ sdl.cpp     25 Mar 2008 08:58:25 -0000      1.65
@@ -294,16 +294,16 @@
 int 
 SDLGui::sdl_to_gnash_modifier(int state)
 {
-  int modifier = gnash::key::MOD_NONE;
+  int modifier = gnash::key::GNASH_MOD_NONE;
   
-  if (state & KMOD_SHIFT) {
-      modifier = modifier | gnash::key::MOD_SHIFT;
+  if (state & KGNASH_MOD_SHIFT) {
+      modifier = modifier | gnash::key::GNASH_MOD_SHIFT;
     }
-    if (state & KMOD_CTRL) {
-      modifier = modifier | gnash::key::MOD_CONTROL;
+    if (state & KGNASH_MOD_CTRL) {
+      modifier = modifier | gnash::key::GNASH_MOD_CONTROL;
     }
-    if (state & KMOD_ALT) {
-      modifier = modifier | gnash::key::MOD_ALT;
+    if (state & KGNASH_MOD_ALT) {
+      modifier = modifier | gnash::key::GNASH_MOD_ALT;
     }
 
     return modifier;