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 aa9d375edb5e94037d77e796251fbb428f215ec8..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
  * 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
  */
  * Copyright:   (c) Stefan Csomor
  * Licence:     wxWindows licence
  */


@@ -22,12 +22,20 @@
 
 #define wxOSX_USE_CORE_TEXT 0
 #define wxOSX_USE_ATSU_TEXT 0
 
 #define wxOSX_USE_CORE_TEXT 0
 #define wxOSX_USE_ATSU_TEXT 0

-#define wxHAS_OPENGL_ES 
+#define wxHAS_OPENGL_ES
+
+#define wxOSX_USE_QUICKTIME 0
+#define wxOSX_USE_AUDIOTOOLBOX 1

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


@@ -58,6 +66,11 @@
 #define wxUSE_DATAVIEWCTRL 0
 #endif
 
 #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
 #if wxUSE_DRAG_AND_DROP
 #undef wxUSE_DRAG_AND_DROP
 #define wxUSE_DRAG_AND_DROP 0


@@ -85,77 +98,69 @@
 #define wxUSE_COMBOBOX 0
 #endif
 
 #define wxUSE_COMBOBOX 0
 #endif
 

-#undef wxUSE_SCROLLBAR 
+#ifndef __WXUNIVERSAL__
+#undef wxUSE_SCROLLBAR

 #define wxUSE_SCROLLBAR 0
 #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_STATUSBAR
+#undef wxUSE_NATIVE_STATUSBAR
+#undef wxUSE_ABOUTDLG
+#undef wxUSE_STATLINE
+#undef wxUSE_COLLPANE
+#undef wxUSE_STATBMP
+#undef wxUSE_STATBOX
+#undef wxUSE_RADIOBTN
+#undef wxUSE_RADIOBOX

 #undef wxUSE_TOGGLEBTN
 
 
 #define wxUSE_STATUSBAR 0
 #define wxUSE_NATIVE_STATUSBAR 0
 #undef wxUSE_TOGGLEBTN
 
 
 #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_STATBOX 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
 
 #define wxUSE_RADIOBTN 0
 #define wxUSE_RADIOBOX 0
 #define wxUSE_TOGGLEBTN 0
 

-#undef wxUSE_TOOLBAR 
-#undef wxUSE_HTML 
+#undef wxUSE_HTML

 
 

-#define wxUSE_TOOLBAR 0

 #define wxUSE_HTML 0
 
 #define wxUSE_HTML 0
 

-#undef wxUSE_RICHTEXT 
+#undef wxUSE_RICHTEXT

 #define wxUSE_RICHTEXT 0
 
 #define wxUSE_RICHTEXT 0
 

-#undef wxUSE_ANIMATIONCTRL 
-#undef wxUSE_CALENDARCTRL 
-#undef wxUSE_COMBOCTRL 
-#undef wxUSE_ODCOMBOBOX 
-#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 
-#undef wxUSE_DATEPICKCTRL 
-#undef wxUSE_DATAVIEWCTRL 
-#undef wxUSE_EDITABLELISTBOX 
-#undef wxUSE_FILEPICKERCTRL 
-#undef wxUSE_DIRPICKERCTRL 
-#undef wxUSE_FILECTRL 
-#undef wxUSE_COLOURPICKERCTRL 
-#undef wxUSE_FONTPICKERCTRL 
-#undef wxUSE_DEBUGREPORT 
-#undef wxUSE_HYPERLINKCTRL 
-#undef wxUSE_STC 
+#undef wxUSE_ANIMATIONCTRL
+#undef wxUSE_CALENDARCTRL
+#undef wxUSE_COMBOCTRL
+#undef wxUSE_ODCOMBOBOX
+#undef wxUSE_BITMAPCOMBOBOX
+#undef wxUSE_BMPBUTTON
+#undef wxUSE_CHECKLISTBOX
+#undef wxUSE_GRID
+#undef wxUSE_LISTBOX
+#undef wxUSE_LISTCTRL
+#undef wxUSE_NOTEBOOK
+#undef wxUSE_SPINBTN
+#undef wxUSE_SPINCTRL
+#undef wxUSE_TREECTRL
+#undef wxUSE_DATEPICKCTRL
+#undef wxUSE_DATAVIEWCTRL
+#undef wxUSE_EDITABLELISTBOX
+#undef wxUSE_FILEPICKERCTRL
+#undef wxUSE_DIRPICKERCTRL
+#undef wxUSE_FILECTRL
+#undef wxUSE_COLOURPICKERCTRL
+#undef wxUSE_FONTPICKERCTRL
+#undef wxUSE_DEBUGREPORT
+#undef wxUSE_HYPERLINKCTRL
+#undef wxUSE_STC

 #undef wxUSE_AUI
 #undef wxUSE_AUI

-#undef wxUSE_BUSYINFO 
-#undef wxUSE_SEARCHCTRL 
+#undef wxUSE_BUSYINFO
+#undef wxUSE_SEARCHCTRL

 
 #define wxUSE_ANIMATIONCTRL 0
 #define wxUSE_CALENDARCTRL 0
 
 #define wxUSE_ANIMATIONCTRL 0
 #define wxUSE_CALENDARCTRL 0


@@ -164,12 +169,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


@@ -188,27 +191,27 @@
 #define wxUSE_BUSYINFO 0
 #define wxUSE_SEARCHCTRL 0
 
 #define wxUSE_BUSYINFO 0
 #define wxUSE_SEARCHCTRL 0
 

-#undef wxUSE_LOGWINDOW 
-#undef wxUSE_LOG_DIALOG 
-#undef wxUSE_LISTBOOK 
-#undef wxUSE_CHOICEBOOK 
-#undef wxUSE_TREEBOOK 
-#undef wxUSE_TOOLBOOK 
-#undef wxUSE_CHOICEDLG 
-#undef wxUSE_HELP 
-#undef wxUSE_PROGRESSDLG 
-#undef  wxUSE_FONTDLG 
-#undef wxUSE_FILEDLG 
-#undef wxUSE_CHOICEDLG 
-#undef wxUSE_NUMBERDLG 
-#undef wxUSE_TEXTDLG 
-#undef wxUSE_DIRDLG 
-#undef wxUSE_STARTUP_TIPS 
-#undef wxUSE_WIZARDDLG 
-#undef wxUSE_TOOLBAR_NATIVE 
-#undef wxUSE_FINDREPLDLG 
-#undef wxUSE_TASKBARICON 
-#undef wxUSE_REARRANGECTRL 
+#undef wxUSE_LOGWINDOW
+#undef wxUSE_LOG_DIALOG
+#undef wxUSE_LISTBOOK
+#undef wxUSE_CHOICEBOOK
+#undef wxUSE_TREEBOOK
+#undef wxUSE_TOOLBOOK
+#undef wxUSE_CHOICEDLG
+#undef wxUSE_HELP
+#undef wxUSE_PROGRESSDLG
+#undef  wxUSE_FONTDLG
+#undef wxUSE_FILEDLG
+#undef wxUSE_CHOICEDLG
+#undef wxUSE_NUMBERDLG
+#undef wxUSE_TEXTDLG
+#undef wxUSE_DIRDLG
+#undef wxUSE_STARTUP_TIPS
+#undef wxUSE_WIZARDDLG
+#undef wxUSE_TOOLBAR_NATIVE
+#undef wxUSE_FINDREPLDLG
+#undef wxUSE_TASKBARICON
+#undef wxUSE_REARRANGECTRL

 
 #define wxUSE_LOGWINDOW 0
 #define wxUSE_LOG_DIALOG 0
 
 #define wxUSE_LOGWINDOW 0
 #define wxUSE_LOG_DIALOG 0


@@ -277,17 +280,89 @@
 #define wxUSE_CLIPBOARD 0
 #endif // wxUSE_CLIPBOARD
 
 #define wxUSE_CLIPBOARD 0
 #endif // wxUSE_CLIPBOARD
 

+/*

 #if wxUSE_GLCANVAS
 #undef wxUSE_GLCANVAS
 #define wxUSE_GLCANVAS 0
 #endif // wxUSE_GLCANVAS
 #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
 
 
 #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_ */
 
 #endif
     /* _WX_OSX_IPHONE_CHKCONF_H_ */