guarding agains NULL

[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 91892e86bcb8fa81d8cbef3d81199cd4db6c37b6..0148719a6560f29c54615786ad10d27881a5682d 100644 (file)
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -4,7 +4,7 @@
  * Author:      Stefan Csomor
  * Modified by:
  * Created:     2008-07-30
- * RCS-ID:      $Id: chkconf.h 54833 2008-07-29 21:03:18Z SC $
+ * RCS-ID:      $Id$
  * Copyright:   (c) Stefan Csomor
  * Licence:     wxWindows licence
  */
@@ -24,10 +24,18 @@
 #define wxOSX_USE_ATSU_TEXT 0
 #define wxHAS_OPENGL_ES
 
+#define wxOSX_USE_QUICKTIME 0
+#define wxOSX_USE_AUDIOTOOLBOX 1
+
 /*
  * 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
@@ -58,6 +66,11 @@
 #define wxUSE_DATAVIEWCTRL 0
 #endif
 
+#if wxUSE_TREELISTCTRL
+#undef wxUSE_TREELISTCTRL
+#define wxUSE_TREELISTCTRL 0
+#endif
+
 #if wxUSE_DRAG_AND_DROP
 #undef wxUSE_DRAG_AND_DROP
 #define wxUSE_DRAG_AND_DROP 0
@@ -85,19 +98,18 @@
 #define wxUSE_COMBOBOX 0
 #endif
 
+#ifndef __WXUNIVERSAL__
 #undef wxUSE_SCROLLBAR
 #define wxUSE_SCROLLBAR 0
+#endif
 
 #undef wxUSE_STATUSBAR
 #undef wxUSE_NATIVE_STATUSBAR
-#undef wxUSE_TEXTCTRL
 #undef wxUSE_ABOUTDLG
-#undef wxUSE_STATTEXT
 #undef wxUSE_STATLINE
 #undef wxUSE_COLLPANE
 #undef wxUSE_STATBMP
 #undef wxUSE_STATBOX
-#undef wxUSE_CHECKBOX
 #undef wxUSE_RADIOBTN
 #undef wxUSE_RADIOBOX
 #undef wxUSE_TOGGLEBTN
@@ -105,22 +117,17 @@
 
 #define wxUSE_STATUSBAR 0
 #define wxUSE_NATIVE_STATUSBAR 0
-#define wxUSE_TEXTCTRL 0
 #define wxUSE_ABOUTDLG 0
-#define wxUSE_STATTEXT 0
 #define wxUSE_STATLINE 0
 #define wxUSE_COLLPANE 0
 #define wxUSE_STATBMP 0
 #define wxUSE_STATBOX 0
-#define wxUSE_CHECKBOX 0
 #define wxUSE_RADIOBTN 0
 #define wxUSE_RADIOBOX 0
 #define wxUSE_TOGGLEBTN 0
 
-#undef wxUSE_TOOLBAR
 #undef wxUSE_HTML
 
-#define wxUSE_TOOLBAR 0
 #define wxUSE_HTML 0
 
 #undef wxUSE_RICHTEXT
@@ -133,12 +140,10 @@
 #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_SLIDER
 #undef wxUSE_SPINBTN
 #undef wxUSE_SPINCTRL
 #undef wxUSE_TREECTRL
@@ -164,12 +169,10 @@
 #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_SLIDER 0
 #define wxUSE_SPINBTN 0
 #define wxUSE_SPINCTRL 0
 #define wxUSE_TREECTRL 0
@@ -277,17 +280,89 @@
 #define wxUSE_CLIPBOARD 0
 #endif // wxUSE_CLIPBOARD
 
+/*
 #if wxUSE_GLCANVAS
 #undef wxUSE_GLCANVAS
 #define wxUSE_GLCANVAS 0
 #endif // wxUSE_GLCANVAS
-
+*/
 
 #if wxUSE_COLOURDLG
 #undef wxUSE_COLOURDLG
 #define wxUSE_COLOURDLG 0
 #endif // wxUSE_COLOURDLG
 
+// 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
+#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
+
+#if wxUSE_UIACTIONSIMULATOR
+#undef wxUSE_UIACTIONSIMULATOR
+#define wxUSE_UIACTIONSIMULATOR 0
+#endif
+
+#if wxUSE_RICHMSGDLG
+#undef wxUSE_RICHMSGDLG
+#define wxUSE_RICHMSGDLG 0
+#endif
+
+#if wxUSE_RICHTEXT
+#undef wxUSE_RICHTEXT
+#define wxUSE_RICHTEXT 0
+#endif
+
+#if wxUSE_TIMEPICKCTRL
+#undef wxUSE_TIMEPICKCTRL
+#define wxUSE_TIMEPICKCTRL 0
+#endif
+
+#if wxUSE_RICHTOOLTIP
+#undef wxUSE_RICHTOOLTIP
+#define wxUSE_RICHTOOLTIP 0
+#endif
+
 #endif
     /* _WX_OSX_IPHONE_CHKCONF_H_ */