Richtext interface fixes and additions for Phoenix

[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 caf0a2ff577b9e82819b6f4ed8671d9a46305373..bcb436597b2cc0f3962418a404b3c5aa7013a8b9 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
  */


@@ -20,7 +20,7 @@
  * under a certain platform
  */
 
  * under a certain platform
  */
 

-#define wxOSX_USE_CORE_TEXT 0
+#define wxOSX_USE_CORE_TEXT 1

 #define wxOSX_USE_ATSU_TEXT 0
 #define wxHAS_OPENGL_ES
 
 #define wxOSX_USE_ATSU_TEXT 0
 #define wxHAS_OPENGL_ES
 


@@ -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


@@ -61,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


@@ -89,7 +99,7 @@
 #endif
 
 #ifndef __WXUNIVERSAL__
 #endif
 
 #ifndef __WXUNIVERSAL__

-#undef wxUSE_SCROLLBAR 
+#undef wxUSE_SCROLLBAR

 #define wxUSE_SCROLLBAR 0
 #endif
 
 #define wxUSE_SCROLLBAR 0
 #endif
 


@@ -284,10 +294,74 @@
 
 // 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
+
+#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_ */