[brlcad-commits] SF.net SVN: brlcad:[72472] brlcad/trunk/src/other/tk

[starseeker--- via brlcad-commits]

Revision: 72472
          http://sourceforge.net/p/brlcad/code/72472
Author:   starseeker
Date:     2019-02-19 17:44:00 +0000 (Tue, 19 Feb 2019)
Log Message:
-----------
few more fixes

Modified Paths:
--------------
    brlcad/trunk/src/other/tk/generic/tkBind.c
    brlcad/trunk/src/other/tk/win/tkWinDefault.h
    brlcad/trunk/src/other/tk/win/tkWinKey.c

Modified: brlcad/trunk/src/other/tk/generic/tkBind.c
===================================================================
--- brlcad/trunk/src/other/tk/generic/tkBind.c  2019-02-19 17:35:05 UTC (rev 
72471)
+++ brlcad/trunk/src/other/tk/generic/tkBind.c  2019-02-19 17:44:00 UTC (rev 
72472)
@@ -406,7 +406,7 @@
 #define MULT_CLICKS    7
 
 static ModInfo modArray[] = {
-    {"Control",                ControlMask,    0},
+    {"Control",                TkControlMask,  0},
     {"Shift",          ShiftMask,      0},
     {"Lock",           LockMask,       0},
     {"Meta",           META_MASK,      0},

Modified: brlcad/trunk/src/other/tk/win/tkWinDefault.h
===================================================================
--- brlcad/trunk/src/other/tk/win/tkWinDefault.h        2019-02-19 17:35:05 UTC 
(rev 72471)
+++ brlcad/trunk/src/other/tk/win/tkWinDefault.h        2019-02-19 17:44:00 UTC 
(rev 72472)
@@ -246,7 +246,7 @@
 #define DEF_MENU_ENTRY_ACTIVE_FG       (char *) NULL
 #define DEF_MENU_ENTRY_ACCELERATOR     (char *) NULL
 #define DEF_MENU_ENTRY_BG              (char *) NULL
-#define DEF_MENU_ENTRY_BITMAP          None
+#define DEF_MENU_ENTRY_BITMAP          TkNone
 #define DEF_MENU_ENTRY_COLUMN_BREAK    "0"
 #define DEF_MENU_ENTRY_COMMAND         (char *) NULL
 #define DEF_MENU_ENTRY_COMPOUND        "none"

Modified: brlcad/trunk/src/other/tk/win/tkWinKey.c
===================================================================
--- brlcad/trunk/src/other/tk/win/tkWinKey.c    2019-02-19 17:35:05 UTC (rev 
72471)
+++ brlcad/trunk/src/other/tk/win/tkWinKey.c    2019-02-19 17:44:00 UTC (rev 
72472)
@@ -412,7 +412,7 @@
      */
 
     if ((sym == NoSymbol) && ((state & TkControlMask) || (state & Mod2Mask))) {
-       state &= ~(ControlMask | Mod2Mask);
+       state &= ~(TkControlMask | Mod2Mask);
        sym = KeycodeToKeysym(eventPtr->xkey.keycode, state, 0);
     }
     if ((sym == NoSymbol) && (state & ShiftMask)) {

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits