Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-26 00:58:37 +02:00
Code Issues Releases Wiki Activity

Fix compilation of EXPERIMENTAL_THEMING

Browse Source
This commit is contained in:
Paul Licameli 2016-04-27 10:49:19 -04:00
parent 3154b78b0f
commit 5474ff752d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/Ruler.cpp
View File

@ -96,6 +96,8 @@ using std::max;
#define kTopInset 4 #define kTopInset 4
wxColour Ruler::mTickColour{ 153, 153, 153 };
// //
// Ruler // Ruler
// //
@ -120,7 +122,6 @@ Ruler::Ruler()
mBottom = -1; mBottom = -1;
mbTicksOnly = true; mbTicksOnly = true;
mbTicksAtExtremes = false; mbTicksAtExtremes = false;
mTickColour = wxColour(153,153,153);
mPen.SetColour(mTickColour); mPen.SetColour(mTickColour);
// Note: the font size is now adjusted automatically whenever // Note: the font size is now adjusted automatically whenever
@ -1572,7 +1573,7 @@ void Ruler::Label::Draw(wxDC&dc, bool twoTone) const
#ifdef EXPERIMENTAL_THEMING #ifdef EXPERIMENTAL_THEMING
// TODO: handle color distinction // TODO: handle color distinction
mDC->SetTextForeground(mTickColour); dc.SetTextForeground(mTickColour);
#else #else
dc.SetTextForeground(altColor ? *wxBLUE : *wxBLACK); dc.SetTextForeground(altColor ? *wxBLUE : *wxBLACK);
#endif #endif

2
src/widgets/Ruler.h
View File

@ -168,7 +168,7 @@ public:
wxRect mRect; wxRect mRect;
private: private:
wxColour mTickColour; static wxColour mTickColour;
wxPen mPen; wxPen mPen;
int mMaxWidth, mMaxHeight; int mMaxWidth, mMaxHeight;