Update of /cvsroot/audacity/audacity-src/src/effects
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31734
Modified Files:
Phaser.cpp
Log Message:
Fix sliders under wxGTK.
Index: Phaser.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/Phaser.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Phaser.cpp 22 Jun 2008 00:48:23 -0000 1.37
+++ Phaser.cpp 25 May 2009 11:20:36 -0000 1.38
@@ -221,37 +221,57 @@
S.EndHorizontalLay();
S.SetBorder(5);
- S.StartMultiColumn(3, wxCENTER);
+ S.StartMultiColumn(3, wxEXPAND);
{
+ wxSlider *s;
+ S.SetStretchyCol(1);
S.Id(ID_PHASER_STAGESTEXT).AddTextBox(_("Stages:"), wxT(""), 12);
S.SetStyle(wxSL_HORIZONTAL);
- S.Id(ID_PHASER_STAGESSLIDER).AddSlider(wxT(""), 2, STAGES_MAX,
STAGES_MIN)->
- SetName(_("Stages"));
+ s = S.Id(ID_PHASER_STAGESSLIDER).AddSlider(wxT(""), 2, STAGES_MAX,
STAGES_MIN);
+ s->SetName(_("Stages"));
+#if defined(__WXGTK__)
+ s->SetMinSize(wxSize(100, -1));
+#endif
S.Id(ID_PHASER_DRYWETTEXT).AddTextBox(_("Dry/Wet:"), wxT(""), 12);
S.SetStyle(wxSL_HORIZONTAL);
- S.Id(ID_PHASER_DRYWETSLIDER).AddSlider(wxT(""), 0, DRYWET_MAX,
DRYWET_MIN)->
- SetName(_("Dry Wet"));
+ s = S.Id(ID_PHASER_DRYWETSLIDER).AddSlider(wxT(""), 0, DRYWET_MAX,
DRYWET_MIN);
+ s->SetName(_("Dry Wet"));
+#if defined(__WXGTK__)
+ s->SetMinSize(wxSize(100, -1));
+#endif
S.Id(ID_PHASER_FREQTEXT).AddTextBox(_("LFO Frequency (Hz):"), wxT(""),
12);
S.SetStyle(wxSL_HORIZONTAL);
- S.Id(ID_PHASER_FREQSLIDER).AddSlider(wxT(""), 100, FREQ_MAX, FREQ_MIN)->
- SetName(_("LFO frequency in hertz"));
+ s = S.Id(ID_PHASER_FREQSLIDER).AddSlider(wxT(""), 100, FREQ_MAX,
FREQ_MIN);
+ s->SetName(_("LFO frequency in hertz"));
+#if defined(__WXGTK__)
+ s->SetMinSize(wxSize(100, -1));
+#endif
S.Id(ID_PHASER_PHASETEXT).AddTextBox(_("LFO Start Phase (deg.):"),
wxT(""), 12);
S.SetStyle(wxSL_HORIZONTAL);
- S.Id(ID_PHASER_PHASESLIDER).AddSlider(wxT(""), 0, PHASE_MAX, PHASE_MIN)->
- SetName(_("LFO start phase in degrees"));
+ s = S.Id(ID_PHASER_PHASESLIDER).AddSlider(wxT(""), 0, PHASE_MAX,
PHASE_MIN);
+ s->SetName(_("LFO start phase in degrees"));
+#if defined(__WXGTK__)
+ s->SetMinSize(wxSize(100, -1));
+#endif
S.Id(ID_PHASER_DEPTHTEXT).AddTextBox(_("Depth:"), wxT(""), 12);
S.SetStyle(wxSL_HORIZONTAL);
- S.Id(ID_PHASER_DEPTHSLIDER).AddSlider(wxT(""), 0, DEPTH_MAX, DEPTH_MIN)->
- SetName(_("Depth in percent"));
+ s = S.Id(ID_PHASER_DEPTHSLIDER).AddSlider(wxT(""), 0, DEPTH_MAX,
DEPTH_MIN);
+ s->SetName(_("Depth in percent"));
+#if defined(__WXGTK__)
+ s->SetMinSize(wxSize(100, -1));
+#endif
S.Id(ID_PHASER_FEEDBACKTEXT).AddTextBox(_("Feedback (%):"), wxT(""), 12);
S.SetStyle(wxSL_HORIZONTAL);
- S.Id(ID_PHASER_FEEDBACKSLIDER).AddSlider(wxT(""), 0, FB_MAX, FB_MIN)->
- SetName(_("Feedback in percent"));
+ s = S.Id(ID_PHASER_FEEDBACKSLIDER).AddSlider(wxT(""), 0, FB_MAX, FB_MIN);
+ s->SetName(_("Feedback in percent"));
+#if defined(__WXGTK__)
+ s->SetMinSize(wxSize(100, -1));
+#endif
}
S.EndMultiColumn();
}
------------------------------------------------------------------------------
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
