Update of /cvsroot/audacity/audacity-src/win
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv32430
Modified Files:
configwin.h
Log Message:
Support wxWidgets 2.6 and 2.8.
Index: configwin.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/configwin.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- configwin.h 19 Oct 2006 10:45:52 -0000 1.22
+++ configwin.h 14 Apr 2007 10:07:39 -0000 1.23
@@ -59,17 +59,28 @@
#include <wx/defs.h>
#if wxUSE_ACCESSIBILITY
-#define wxTextCtrlNameStr overrideTextCtrlNameStr
-extern const wxChar *overrideTextCtrlNameStr;
-#define wxChoiceNameStr overrideChoiceNameStr
-extern const wxChar *overrideChoiceNameStr;
+#define _PTR_
-#define wxComboBoxNameStr overrideComboBoxNameStr
+#if wxCHECK_VERSION(2, 8, 0)
+extern const wxChar overrideTextCtrlNameStr[];
+extern const wxChar overrideChoiceNameStr[];
+extern const wxChar overrideComboBoxNameStr[];
+extern const wxChar overrideSliderNameStr[];
+#else
+extern const wxChar *overrideTextCtrlNameStr;
+extern const wxChar *overrideChoiceNameStr;
extern const wxChar *overrideComboBoxNameStr;
+extern const wxChar *overrideSliderNameStr;
+#endif
+#define wxTextCtrlNameStr overrideTextCtrlNameStr
+#define wxChoiceNameStr overrideChoiceNameStr
+#define wxComboBoxNameStr overrideComboBoxNameStr
#define wxSliderNameStr overrideSliderNameStr
-extern const wxChar *overrideSliderNameStr;
+
+#undef _PTR_
#endif
+
// arch-tag: dcb2defc-1c07-4bae-a9ca-c5377cb470e4
-------------------------------------------------------------------------
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
