Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18474
Modified Files:
ControlToolBar.cpp ToolBar.cpp ToolManager.cpp
Log Message:
Make compatible with wxWidgets 2.8.
Index: ToolManager.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ToolManager.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ToolManager.cpp 23 Oct 2006 04:47:22 -0000 1.10
+++ ToolManager.cpp 18 Nov 2006 07:45:20 -0000 1.11
@@ -527,7 +527,7 @@
if( width[ ndx ] != -1 && height[ ndx ] != -1 )
{
wxSize sz( width[ ndx ], height[ ndx ] );
- f->SetMinSize( sz );
+ f->SetSizeHints( sz );
f->SetSize( sz );
f->Layout();
}
Index: ControlToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ControlToolBar.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ControlToolBar.cpp 6 Nov 2006 12:13:31 -0000 1.6
+++ ControlToolBar.cpp 18 Nov 2006 07:45:20 -0000 1.7
@@ -159,7 +159,7 @@
wxImage * down2 = OverlayImage(bmpRecoloredDownLarge, bmpLoop, xoff
+ 1, yoff + 1);
wxImage * disable2 = OverlayImage(bmpRecoloredUpLarge,
bmpLoopDisabled, xoff, yoff);
- mPlay->SetAlternateImages(up2, hilite2, down2, disable2);
+ mPlay->SetAlternateImages(*up2, *hilite2, *down2, *disable2);
delete up2;
delete hilite2;
Index: ToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ToolBar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ToolBar.cpp 22 Oct 2006 09:54:26 -0000 1.5
+++ ToolBar.cpp 18 Nov 2006 07:45:20 -0000 1.6
@@ -34,6 +34,7 @@
#include <wx/gdicmn.h>
#include <wx/image.h>
#include <wx/intl.h>
+#include <wx/settings.h>
#include <wx/sizer.h>
#include <wx/sysopt.h>
#include <wx/window.h>
@@ -442,8 +443,8 @@
wxImage * disable2 = OverlayImage(eUp, eDisabled, xoff, yoff);
AButton * button =
- new AButton(this, id, placement, size, up2, hilite2, down2,
- disable2, processdownevents);
+ new AButton(this, id, placement, size, *up2, *hilite2, *down2,
+ *disable2, processdownevents);
delete up2;
delete down2;
-------------------------------------------------------------------------
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
