Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29906
Modified Files:
Menus.cpp
Log Message:
Fix updating of menu checkmarks.
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -d -r1.475 -r1.476
--- Menus.cpp 25 May 2009 07:45:47 -0000 1.475
+++ Menus.cpp 25 May 2009 11:14:16 -0000 1.476
@@ -710,7 +710,7 @@
#endif // EXPERIMENTAL_SCOREALIGN
c->AddSeparator();
- c->AddItem(wxT("StickyLabels"), _("&Link Audio and Label Tracks"),
FN(OnStickyLabel), 0);
+ c->AddItem(wxT("StickyLabels"), _("&Link Audio and Label Tracks"),
FN(OnStickyLabel), 0);
c->AddSeparator();
c->AddItem(wxT("AddLabel"), _("Add Label At &Selection\tCtrl+B"),
FN(OnAddLabel));
@@ -1447,6 +1447,17 @@
for (int i = 0; i < ToolBarCount; i++) {
mToolManager->GetToolBar(i)->EnableDisableButtons();
}
+
+ // These don't really belong here, but it's easier and especially so for
+ // the Edit toolbar and the sticky menu item.
+ bool active;
+ gPrefs->Read(wxT("/AudioIO/SoundActivatedRecord"),&active, false);
+ mCommandManager.Check(wxT("SoundActivation"), active);
+ gPrefs->Read(wxT("/AudioIO/Duplex"),&active, true);
+ mCommandManager.Check(wxT("Duplex"), active);
+ gPrefs->Read(wxT("/AudioIO/SWPlaythrough"),&active, false);
+ mCommandManager.Check(wxT("SWPlaythrough"), active);
+ mCommandManager.Check(wxT("StickyLabels"), mStickyFlag);
}
void AudacityProject::UpdateMenus()
@@ -1486,16 +1497,6 @@
#endif
ModifyToolbarMenus();
-
- bool active;
- gPrefs->Read(wxT("/AudioIO/SoundActivatedRecord"),&active, false);
- mCommandManager.Check(wxT("SoundActivation"), active);
- gPrefs->Read(wxT("/AudioIO/Duplex"),&active, true);
- mCommandManager.Check(wxT("Duplex"), active);
- gPrefs->Read(wxT("/AudioIO/SWPlaythrough"),&active, false);
- mCommandManager.Check(wxT("SWPlaythrough"), active);
-
- mCommandManager.Check(wxT("StickyLabels"), mStickyFlag);
}
//
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
