Update of /cvsroot/audacity/audacity-src/src/prefs
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv32020/src/prefs
Modified Files:
PrefsDialog.cpp
Log Message:
-ThemePrefs not in 1.4.
- wx2.6.x workaround for treebook width made conditional on version.
Index: PrefsDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/prefs/PrefsDialog.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- PrefsDialog.cpp 18 Jun 2007 23:31:35 -0000 1.43
+++ PrefsDialog.cpp 21 Jun 2007 13:36:07 -0000 1.44
@@ -129,12 +129,14 @@
#endif
);
+#if !wxCHECK_VERSION(2, 8, 4)
// The list width is determined by the width of the images.
// If you don't add some images the list will be too narrow.
wxImageList *pImages = new wxImageList(64,1);
wxBitmap bmpTrial(TrialImage);
pImages->Add( bmpTrial );
mCategories->SetImageList(pImages);
+#endif
//These two lines were an attempt to size the list correctly.
//They don't work (in wxWidgets 2.6.1/XP)
@@ -155,7 +157,11 @@
w = new SpectrumPrefs(mCategories); mCategories->AddPage(w,
w->GetName(),false,0);
w = new DirectoriesPrefs(mCategories); mCategories->AddPage(w,
w->GetName(),false,0);
w = new GUIPrefs(mCategories); mCategories->AddPage(w,
w->GetName(),false,0);
+
+#ifdef EXPERIMENTAL_THEME_PREFS
w = new ThemePrefs(mCategories); mCategories->AddPage(w,
w->GetName(),false,0);
+#endif
+
w = new BatchPrefs(mCategories); mCategories->AddPage(w,
w->GetName(),false,0);
w = new KeyConfigPrefs(mCategories); mCategories->AddPage(w,
w->GetName(),false,0);
w = new MousePrefs(mCategories); mCategories->AddPage(w,
w->GetName(),false,0);
-------------------------------------------------------------------------
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
