Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31461

Modified Files:
        TrackPanel.cpp 
Log Message:
Use Cmd*() instead of Meta*() for mouse events (this broke CTRL+click on Linux 
and Windows)
Enable CTRL+wheel zooming on the Mac.

Index: TrackPanel.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/TrackPanel.cpp,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -d -r1.361 -r1.362
--- TrackPanel.cpp      7 Jun 2007 22:32:26 -0000       1.361
+++ TrackPanel.cpp      17 Jun 2007 06:37:43 -0000      1.362
@@ -1600,7 +1600,7 @@
 
    // A control-click will set just the indicator to the clicked spot,
    // and turn playback on.  
-   else if(event.MetaDown())
+   else if(event.CmdDown())
       {
          AudacityProject *p = GetActiveProject();
          if (p) {
@@ -2135,7 +2135,7 @@
       mCapturedClipArray.Clear();
    }
    
-   mSlideUpDownOnly = event.MetaDown() && !multiToolModeActive;
+   mSlideUpDownOnly = event.CmdDown() && !multiToolModeActive;
 
    mCapturedTrack = vt;
    mCapturedRect = r;
@@ -3719,7 +3719,7 @@
       mListener->TP_ScrollWindow(
          mViewInfo->h +
          50.0 * -steps / mViewInfo->zoom);
-   } else if (event.ControlDown())
+   } else if (event.CmdDown())
    {
       // MM: Zoom in/out when used with Control key down
       // MM: I don't understand what trackLeftEdge does
@@ -4284,7 +4284,7 @@
    // From here on the order in which we hit test determines 
    // which tool takes priority in the rare cases where it
    // could be more than one.
-   } else if (event.MetaDown()){
+   } else if (event.CmdDown()){
       // msmeyer: If control is down, slide single clip
       // msmeyer: If control and shift are down, slide all clips
       currentTool = slideTool;


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to