Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10471/widgets

Modified Files:
        treebook.cpp treebook.h 
Log Message:
Use native wxTreebook when available

Index: treebook.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/treebook.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- treebook.h  18 Nov 2006 05:53:14 -0000      1.4
+++ treebook.h  26 Mar 2007 15:15:56 -0000      1.5
@@ -7,6 +7,15 @@
 // License:     wxWindows license 
 ///////////////////////////////////////////////////////////////////////////// 
 
+#include <wx/version.h>
+
+#if wxCHECK_VERSION(2,7,0)
+
+// wxWidgets 2.7.x and greater does have wxTreebook
+#include <wx/treebook.h>
+
+#else
+
 #ifndef __TREEBOOK_H__ 
 #define __TREEBOOK_H__ 
 
@@ -136,3 +145,5 @@
 }; 
 
 #endif // __TREEBOOK_H__ 
+
+#endif // wxCHECK_VERSION(2,7,0)

Index: treebook.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/treebook.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- treebook.cpp        18 Nov 2006 07:45:29 -0000      1.7
+++ treebook.cpp        26 Mar 2007 15:15:56 -0000      1.8
@@ -7,6 +7,14 @@
 // License:     wxWindows license 
 ///////////////////////////////////////////////////////////////////////////// 
 
+#include <wx/version.h>
+
+#if !wxCHECK_VERSION(2,7,0)
+
+//
+// For wxWidgets 2.6.x, use our backported version of wxTreebook
+//
+
 #include "wx/listctrl.h" 
 #include "wx/statline.h" 
 #include "wx/listbook.h"  // wxListbookEvent 
@@ -514,3 +522,5 @@
     //return m_list->SetItemImage(n, imageId); 
    return false; 
 }
+
+#endif // wxCHECK_VERSION(2,7,0)


-------------------------------------------------------------------------
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

Reply via email to