Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv26071/widgets
Modified Files:
Tag: Audacity_UmixIt
ASlider.cpp ASlider.h
Log Message:
Mixer board fixes for Mac
Index: ASlider.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ASlider.cpp,v
retrieving revision 1.29.2.6.2.1
retrieving revision 1.29.2.6.2.2
diff -u -d -r1.29.2.6.2.1 -r1.29.2.6.2.2
--- ASlider.cpp 2 Feb 2007 01:36:06 -0000 1.29.2.6.2.1
+++ ASlider.cpp 26 Feb 2007 11:23:26 -0000 1.29.2.6.2.2
@@ -173,8 +173,14 @@
bool heavyweight /* = false */
)
{
+ bool aquaOk = true;
+ if (style & NO_AQUA) {
+ style -= NO_AQUA;
+ aquaOk = false;
+ }
+
Init(parent, name, pos, size, minValue, maxValue,
- stepValue, canUseShift, style, heavyweight);
+ stepValue, canUseShift, style, aquaOk, heavyweight);
}
// Construct predefined slider
@@ -187,6 +193,11 @@
{
wxString leftLabel, rightLabel;
float minValue, maxValue, stepValue;
+ bool aquaOk = true;
+ if (style & NO_AQUA) {
+ style -= NO_AQUA;
+ aquaOk = false;
+ }
switch(style)
{
@@ -213,20 +224,21 @@
}
Init(parent, name, pos, size, minValue, maxValue, stepValue,
- true, style, heavyweight);
+ true, style, aquaOk, heavyweight);
}
void LWSlider::Init(wxWindow * parent,
- wxString name,
- const wxPoint &pos,
- const wxSize &size,
- float minValue,
- float maxValue,
- float stepValue,
- bool canUseShift,
- int style,
- bool heavyweight /* = false */
- )
+ wxString name,
+ const wxPoint &pos,
+ const wxSize &size,
+ float minValue,
+ float maxValue,
+ float stepValue,
+ bool canUseShift,
+ int style,
+ bool aquaOk,
+ bool heavyweight /* = false */
+ )
{
mName = name;
mStyle = style;
@@ -256,8 +268,11 @@
AColor::Medium(dc, true);
wxColour selBkgnd = dc->GetBrush().GetColour();
- wxImage *backgroundImage =
- CreateSysBackground(mWidth, mHeight, 0, bkgnd);
+ wxImage *backgroundImage;
+ if (aquaOk)
+ backgroundImage = CreateSysBackground(mWidth, mHeight, 0, bkgnd);
+ else
+ backgroundImage = CreateBackground(mWidth, mHeight, bkgnd);
#if wxCHECK_VERSION(2, 5, 0)
wxBitmap backgroundBitmap(backgroundImage);
#else
Index: ASlider.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ASlider.h,v
retrieving revision 1.12.8.1
retrieving revision 1.12.8.2
diff -u -d -r1.12.8.1 -r1.12.8.2
--- ASlider.h 2 Feb 2007 01:36:06 -0000 1.12.8.1
+++ ASlider.h 26 Feb 2007 11:23:27 -0000 1.12.8.2
@@ -27,7 +27,9 @@
//
#define FRAC_SLIDER 1 // 0.0...1.0
#define DB_SLIDER 2 // -36...36 dB
-#define PAN_SLIDER 3 // -1.0...1.0
+#define PAN_SLIDER 4 // -1.0...1.0
+
+#define NO_AQUA 0x100
// Customizable slider only: If stepValue is STEP_CONTINUOUS,
// every value on the slider between minValue and maxValue
@@ -78,6 +80,7 @@
float stepValue,
bool canUseShift,
int style,
+ bool aquaOk,
bool heavyweight=false
);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
