Make wxUString compilable with VC6.

[wxWidgets.git] / include / wx / osx / iphone / chkconf.h

diff --git a/include/wx/osx/iphone/chkconf.h b/include/wx/osx/iphone/chkconf.h
index dd53b32f50ca0f1b3395e9aaa607de5af99fbf3c..ac6161a62c6399a589844038e2db95812da12f61 100644 (file)
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -31,6 +31,11 @@
  * turning off capabilities that don't work under iphone yet
  */
 
  * turning off capabilities that don't work under iphone yet
  */
 

+#if wxUSE_MIMETYPE
+#undef wxUSE_MIMETYPE
+#define wxUSE_MIMETYPE 0
+#endif
+

 #if wxUSE_MDI
 #undef wxUSE_MDI
 #define wxUSE_MDI 0
 #if wxUSE_MDI
 #undef wxUSE_MDI
 #define wxUSE_MDI 0


@@ -89,15 +94,13 @@
 #endif
 
 #ifndef __WXUNIVERSAL__
 #endif
 
 #ifndef __WXUNIVERSAL__

-#undef wxUSE_SCROLLBAR 
+#undef wxUSE_SCROLLBAR

 #define wxUSE_SCROLLBAR 0
 #endif
 
 #undef wxUSE_STATUSBAR
 #undef wxUSE_NATIVE_STATUSBAR
 #define wxUSE_SCROLLBAR 0
 #endif
 
 #undef wxUSE_STATUSBAR
 #undef wxUSE_NATIVE_STATUSBAR

-#undef wxUSE_TEXTCTRL

 #undef wxUSE_ABOUTDLG
 #undef wxUSE_ABOUTDLG

-#undef wxUSE_STATTEXT

 #undef wxUSE_STATLINE
 #undef wxUSE_COLLPANE
 #undef wxUSE_STATBMP
 #undef wxUSE_STATLINE
 #undef wxUSE_COLLPANE
 #undef wxUSE_STATBMP


@@ -109,9 +112,7 @@
 
 #define wxUSE_STATUSBAR 0
 #define wxUSE_NATIVE_STATUSBAR 0
 
 #define wxUSE_STATUSBAR 0
 #define wxUSE_NATIVE_STATUSBAR 0

-#define wxUSE_TEXTCTRL 0

 #define wxUSE_ABOUTDLG 0
 #define wxUSE_ABOUTDLG 0

-#define wxUSE_STATTEXT 0

 #define wxUSE_STATLINE 0
 #define wxUSE_COLLPANE 0
 #define wxUSE_STATBMP 0
 #define wxUSE_STATLINE 0
 #define wxUSE_COLLPANE 0
 #define wxUSE_STATBMP 0


@@ -134,12 +135,10 @@
 #undef wxUSE_BITMAPCOMBOBOX
 #undef wxUSE_BMPBUTTON
 #undef wxUSE_CHECKLISTBOX
 #undef wxUSE_BITMAPCOMBOBOX
 #undef wxUSE_BMPBUTTON
 #undef wxUSE_CHECKLISTBOX

-#undef wxUSE_GAUGE

 #undef wxUSE_GRID
 #undef wxUSE_LISTBOX
 #undef wxUSE_LISTCTRL
 #undef wxUSE_NOTEBOOK
 #undef wxUSE_GRID
 #undef wxUSE_LISTBOX
 #undef wxUSE_LISTCTRL
 #undef wxUSE_NOTEBOOK

-#undef wxUSE_SLIDER

 #undef wxUSE_SPINBTN
 #undef wxUSE_SPINCTRL
 #undef wxUSE_TREECTRL
 #undef wxUSE_SPINBTN
 #undef wxUSE_SPINCTRL
 #undef wxUSE_TREECTRL


@@ -165,12 +164,10 @@
 #define wxUSE_BITMAPCOMBOBOX 0
 #define wxUSE_BMPBUTTON 0
 #define wxUSE_CHECKLISTBOX 0
 #define wxUSE_BITMAPCOMBOBOX 0
 #define wxUSE_BMPBUTTON 0
 #define wxUSE_CHECKLISTBOX 0

-#define wxUSE_GAUGE 0

 #define wxUSE_GRID 0
 #define wxUSE_LISTBOX 0
 #define wxUSE_LISTCTRL 0
 #define wxUSE_NOTEBOOK 0
 #define wxUSE_GRID 0
 #define wxUSE_LISTBOX 0
 #define wxUSE_LISTCTRL 0
 #define wxUSE_NOTEBOOK 0

-#define wxUSE_SLIDER 0

 #define wxUSE_SPINBTN 0
 #define wxUSE_SPINCTRL 0
 #define wxUSE_TREECTRL 0
 #define wxUSE_SPINBTN 0
 #define wxUSE_SPINCTRL 0
 #define wxUSE_TREECTRL 0


@@ -292,10 +289,49 @@
 
 // iphone has a toolbar that is a regular UIView
 
 
 // iphone has a toolbar that is a regular UIView
 

+#ifdef wxOSX_USE_NATIVE_TOOLBAR

 #if wxOSX_USE_NATIVE_TOOLBAR
 #undef wxOSX_USE_NATIVE_TOOLBAR
 #define wxOSX_USE_NATIVE_TOOLBAR 0
 #endif
 #if wxOSX_USE_NATIVE_TOOLBAR
 #undef wxOSX_USE_NATIVE_TOOLBAR
 #define wxOSX_USE_NATIVE_TOOLBAR 0
 #endif

+#else
+#define wxOSX_USE_NATIVE_TOOLBAR 0
+#endif
+
+#if wxUSE_RIBBON
+#undef wxUSE_RIBBON
+#define wxUSE_RIBBON 0
+#endif
+
+#if wxUSE_INFOBAR
+#undef wxUSE_INFOBAR
+#define wxUSE_INFOBAR 0
+#endif
+
+#if wxUSE_FILE_HISTORY
+#undef wxUSE_FILE_HISTORY
+#define wxUSE_FILE_HISTORY 0
+#endif
+
+#if wxUSE_NOTIFICATION_MESSAGE
+#undef wxUSE_NOTIFICATION_MESSAGE
+#define wxUSE_NOTIFICATION_MESSAGE 0
+#endif
+
+#if wxUSE_PROPGRID
+#undef wxUSE_PROPGRID
+#define wxUSE_PROPGRID 0
+#endif
+
+#if wxUSE_WEBKIT
+#undef wxUSE_WEBKIT
+#define wxUSE_WEBKIT 0
+#endif
+
+#if wxUSE_DATAOBJ
+#undef wxUSE_DATAOBJ
+#define wxUSE_DATAOBJ 0
+#endif

 
 #endif
     /* _WX_OSX_IPHONE_CHKCONF_H_ */
 
 #endif
     /* _WX_OSX_IPHONE_CHKCONF_H_ */