Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18821
Modified Files:
Tag: Audacity_UmixIt
ControlToolBar.cpp Makefile.in Project.cpp
Log Message:
Fixed control toolbar spacing, updated Makefile, fixed a crash on startup, and
rewrote the AdornedRulerPanel selection clicking and dragging handler.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Makefile.in,v
retrieving revision 1.73.2.10.2.3
retrieving revision 1.73.2.10.2.4
diff -u -d -r1.73.2.10.2.3 -r1.73.2.10.2.4
--- Makefile.in 26 Feb 2007 08:08:03 -0000 1.73.2.10.2.3
+++ Makefile.in 20 Apr 2007 09:57:02 -0000 1.73.2.10.2.4
@@ -136,6 +136,7 @@
$(OBJDIR)/prefs/SpectrumPrefs.o \
$(OBJDIR)/widgets/AButton.o \
$(OBJDIR)/widgets/ASlider.o \
+ $(OBJDIR)/widgets/LinkingHtmlWindow.o \
$(OBJDIR)/widgets/Meter.o \
$(OBJDIR)/widgets/Ruler.o \
$(OBJDIR)/widgets/Warning.o \
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.178.2.17.2.18
retrieving revision 1.178.2.17.2.19
diff -u -d -r1.178.2.17.2.18 -r1.178.2.17.2.19
--- Project.cpp 20 Apr 2007 01:22:33 -0000 1.178.2.17.2.18
+++ Project.cpp 20 Apr 2007 09:57:02 -0000 1.178.2.17.2.19
@@ -198,14 +198,17 @@
AudacityProject *p = new AudacityProject(parentWindow, -1,
wxPoint(wndRect.x, wndRect.y),
wxSize(wndRect.width, wndRect.height));
+ if (!gActiveProject)
+ gActiveProject = p;
+
if(bMaximized)
p->Maximize(true);
- p->Show(true);
-
//Set the new project as active:
SetActiveProject(p);
+ p->Show(true);
+
return p;
}
Index: ControlToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/ControlToolBar.cpp,v
retrieving revision 1.61.2.14.2.3
retrieving revision 1.61.2.14.2.4
diff -u -d -r1.61.2.14.2.3 -r1.61.2.14.2.4
--- ControlToolBar.cpp 20 Apr 2007 01:22:32 -0000 1.61.2.14.2.3
+++ ControlToolBar.cpp 20 Apr 2007 09:57:02 -0000 1.61.2.14.2.4
@@ -147,6 +147,7 @@
mIdealSize = wxSize(420, 55); // ideal for (mShowTools == true)
mTitle = _("Audacity Control Toolbar");
mType = ControlToolBarID;
+ mShowTools = true;
wxColour backgroundColour =
wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
@@ -183,7 +184,7 @@
#endif
mCurrentTool = selectTool;
- mShowTools = true;
+
#if (AUDACITY_BRANDING == BRAND_THINKLABS)
// no tools created for Thinklabs
mShowTools = false;
-------------------------------------------------------------------------
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
