Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv3060
Modified Files:
Meter.cpp
Log Message:
Make preferences dialog show above the meter to fix problem when meter toolbar
is floating.
Index: Meter.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/Meter.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Meter.cpp 19 Mar 2007 17:17:33 -0000 1.26
+++ Meter.cpp 27 May 2007 17:56:08 -0000 1.27
@@ -46,6 +46,10 @@
#include <wx/tooltip.h>
#include <wx/msgdlg.h>
+#if defined(__WXMAC__)
+#include <wx/mac/uma.h>
+#endif
+
#include <math.h>
#include "Meter.h"
@@ -1032,16 +1036,26 @@
void Meter::OnPreferences(wxCommandEvent &evt)
{
- long refreshRate = 0;
- if (-1 < (refreshRate = ::wxGetNumberFromUser
- (_("This determines how often the meter is refreshed.\nIf you
have a slower PC you may want to select a\nlower refresh rate (30 per second or
lower), so that\naudio qualtiy is not affected by the meter display."),
- _("Meter refresh rate per second [1-100]: "),
- _("Meter Preferences"),
- mMeterRefreshRate, 1, 100)))
- mMeterRefreshRate = refreshRate;
- gPrefs->Write(wxT("/Meter/MeterRefreshRate"), mMeterRefreshRate);
+ wxNumberEntryDialog
+ d(this,
+ _("This determines how often the meter is refreshed.\nIf you have a
slower PC you may want to select a\nlower refresh rate (30 per second or
lower), so that\naudio qualtiy is not affected by the meter display."),
+ _("Meter refresh rate per second [1-100]: "),
+ _("Meter Preferences"),
+ mMeterRefreshRate,
+ 1,
+ 100);
+
+#if defined(__WXMAC__)
+ // WXMAC doesn't support wxFRAME_FLOAT_ON_PARENT, so we do
+ SetWindowClass((WindowRef)d.MacGetWindowRef(), kFloatingWindowClass);
+#endif
+
+ if (d.ShowModal() == wxID_OK) {
+ mMeterRefreshRate = d.GetValue();
+ gPrefs->Write(wxT("/Meter/MeterRefreshRate"), mMeterRefreshRate);
+ }
- mTimer.Start(1000/mMeterRefreshRate);
+ mTimer.Start(1000 / mMeterRefreshRate);
}
// Indentation settings for Vim and Emacs.
-------------------------------------------------------------------------
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
