Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15364/src
Modified Files:
MixerBoard.cpp
Log Message:
Prevent assertions on OSX
Index: MixerBoard.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/MixerBoard.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- MixerBoard.cpp 7 Aug 2009 04:45:41 -0000 1.17
+++ MixerBoard.cpp 21 Aug 2009 14:20:52 -0000 1.18
@@ -1103,14 +1103,14 @@
// Much of this is taken TrackLabel::DrawMuteSolo
wxMemoryDC dc;
wxString str = _("Mute");
- long textWidth, textHeight;
+ int textWidth, textHeight;
int fontSize = 10;
#ifdef __WXMSW__
fontSize = 8;
#endif
- dc.SetFont(wxFont(fontSize, wxSWISS, wxNORMAL, wxNORMAL));
- dc.GetTextExtent(str, &textWidth, &textHeight);
+ wxFont font(fontSize, wxSWISS, wxNORMAL, wxNORMAL);
+ GetTextExtent(str, &textWidth, &textHeight, NULL, NULL, &font);
mMuteSoloWidth = textWidth + (3 * kInset);
wxBitmap bitmap(mMuteSoloWidth, MUTE_SOLO_HEIGHT);
@@ -1123,6 +1123,7 @@
wxCoord x = bev.x + (bev.width - textWidth) / 2;
wxCoord y = bev.y + (bev.height - textHeight) / 2;
+ dc.SetFont(font);
dc.DrawText(str, x, y);
AColor::Bevel(dc, true, bev);
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
