Compilation fix for gcc-4 and newer.

[wxWidgets.git] / include / wx / setup_gccxml.h

diff --git a/include/wx/setup_gccxml.h b/include/wx/setup_gccxml.h
index 2a96e01681a3024e3d772ab49b9261f3d3b876cf..908ecdfad0dee253be30c3cbc8bc00c369575042 100644 (file)
--- a/include/wx/setup_gccxml.h
+++ b/include/wx/setup_gccxml.h
@@ -156,13 +156,13 @@
 
 
 
 
 
 

-#define wxUSE_DEBUG_CONTEXT 0
+#define wxUSE_DEBUG_CONTEXT 1

 
 

-#define wxUSE_MEMORY_TRACING 0
+#define wxUSE_MEMORY_TRACING 1

 
 

-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 1

 
 

-#define wxUSE_DEBUG_NEW_ALWAYS 0
+#define wxUSE_DEBUG_NEW_ALWAYS 1

 
 #define wxUSE_ON_FATAL_EXCEPTION 1
 
 
 #define wxUSE_ON_FATAL_EXCEPTION 1
 


@@ -182,7 +182,7 @@
 
 #define wxUSE_EXTENDED_RTTI 0
 
 
 #define wxUSE_EXTENDED_RTTI 0
 

-#define wxUSE_STL 0
+#define wxUSE_STL 1

 
 #define wxUSE_LOG 1
 
 
 #define wxUSE_LOG 1
 


@@ -196,8 +196,6 @@
 
 #define wxUSE_THREADS 1
 
 
 #define wxUSE_THREADS 1
 

-#define wxUSE_WEAKREF 1
-

 #define wxUSE_STREAMS 1
 
 #if defined(__DMC__) || defined(__WATCOMC__) \
 #define wxUSE_STREAMS 1
 
 #if defined(__DMC__) || defined(__WATCOMC__) \


@@ -223,7 +221,7 @@
 #define wxUSE_FILE 1
 #define wxUSE_FFILE 1
 
 #define wxUSE_FILE 1
 #define wxUSE_FFILE 1
 

-#define wxUSE_FSVOLUME      0
+#define wxUSE_FSVOLUME      1

 
 #define wxUSE_STDPATHS 1
 
 
 #define wxUSE_STDPATHS 1
 


@@ -253,7 +251,7 @@
 
 #define wxUSE_SOCKETS 1
 
 
 #define wxUSE_SOCKETS 1
 

-#define wxUSE_IPV6          0
+#define wxUSE_IPV6          1

 
 #define wxUSE_FILESYSTEM 1
 
 
 #define wxUSE_FILESYSTEM 1
 


@@ -299,9 +297,9 @@
 
 #define wxUSE_SOUND 1
 
 
 #define wxUSE_SOUND 1
 

-#define wxUSE_MEDIACTRL     0
+#define wxUSE_MEDIACTRL     1

 
 

-#define wxUSE_GSTREAMER    0
+#define wxUSE_GSTREAMER    1

 
 #define wxUSE_XRC 1
 
 
 #define wxUSE_XRC 1
 


@@ -312,9 +310,7 @@
 #define wxUSE_STC 1
 
 
 #define wxUSE_STC 1
 
 

-#ifndef wxUSE_GRAPHICS_CONTEXT
-#define wxUSE_GRAPHICS_CONTEXT 0
-#endif
+#define wxUSE_GRAPHICS_CONTEXT 1

 
 
 #define wxUSE_CONTROLS 1
 
 
 #define wxUSE_CONTROLS 1


@@ -393,7 +389,7 @@
 
 #define wxUSE_ACCEL 1
 
 
 #define wxUSE_ACCEL 1
 

-#define wxUSE_HOTKEY 0
+#define wxUSE_HOTKEY 1

 
 #define wxUSE_CARET 1
 
 
 #define wxUSE_CARET 1
 


@@ -456,8 +452,8 @@
 #define wxUSE_ABOUTDLG 1
 
 
 #define wxUSE_ABOUTDLG 1
 
 

-#define wxUSE_METAFILE              0
-#define wxUSE_ENH_METAFILE          0
+#define wxUSE_METAFILE              1
+#define wxUSE_ENH_METAFILE          1

 #define wxUSE_WIN_METAFILES_ALWAYS  0
 
 
 #define wxUSE_WIN_METAFILES_ALWAYS  0
 
 


@@ -471,7 +467,7 @@
 
 #define wxUSE_HTML 1
 
 
 #define wxUSE_HTML 1
 

-#define wxUSE_GLCANVAS       0
+#define wxUSE_GLCANVAS       1

 
 #define wxUSE_RICHTEXT 1
 
 
 #define wxUSE_RICHTEXT 1
 


@@ -482,7 +478,11 @@
 
 #define wxUSE_DRAG_AND_DROP 1
 
 
 #define wxUSE_DRAG_AND_DROP 1
 

-#define wxUSE_ACCESSIBILITY 0
+#define wxUSE_ACCESSIBILITY 1
+#if !defined( __WXMSW__ )
+    // little hack to make gccxml happy about wxAccessible:
+    #define wxAccessible wxAccessibleBase
+#endif

 
 
 #define wxUSE_SNGLINST_CHECKER 1
 
 
 #define wxUSE_SNGLINST_CHECKER 1


@@ -494,7 +494,7 @@
 #define wxUSE_HELP 1
 
 
 #define wxUSE_HELP 1
 
 

-#define wxUSE_MS_HTML_HELP 0
+#define wxUSE_MS_HTML_HELP 1

 
 
 #define wxUSE_WXHTML_HELP 1
 
 
 #define wxUSE_WXHTML_HELP 1


@@ -572,17 +572,17 @@
     #define wxUSE_UNICODE_MSLU 0
 #endif
 
     #define wxUSE_UNICODE_MSLU 0
 #endif
 

-#define wxUSE_MFC           0
+#define wxUSE_MFC           1

 
 

-#define wxUSE_OLE           0
+#define wxUSE_OLE           1

 
 

-#define wxUSE_OLE_AUTOMATION 0
+#define wxUSE_OLE_AUTOMATION 1

 
 

-#define wxUSE_ACTIVEX 0
+#define wxUSE_ACTIVEX 1

 
 #define wxUSE_DC_CACHEING 0
 
 
 #define wxUSE_DC_CACHEING 0
 

-#define wxUSE_WXDIB 0
+#define wxUSE_WXDIB 1

 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
 
 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
 


@@ -606,7 +606,7 @@
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
 

-#define wxUSE_CRASHREPORT 0
+#define wxUSE_CRASHREPORT 1

 /* --- end MSW options --- */
 
 /*
 /* --- end MSW options --- */
 
 /*