Committing in .

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 4ad05a70bf1bac353f7eebf265611c90970ba31c..b120b93077b5dfcbf392372eb0a8845dc075a5b4 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -331,10 +331,14 @@
 
 #define wxUSE_TREEBOOK 0
 
 
 #define wxUSE_TREEBOOK 0
 

+#define wxUSE_TOOLBOOK 0
+

 #define wxUSE_TAB_DIALOG    0
 
 #define wxUSE_GRID         0
 
 #define wxUSE_TAB_DIALOG    0
 
 #define wxUSE_GRID         0
 

+#define wxUSE_DATAVIEWCTRL   0
+

 #define wxUSE_MINIFRAME 0
 
 
 #define wxUSE_MINIFRAME 0
 
 


@@ -505,6 +509,8 @@
 #define wxUSE_RICHEDIT2 0
 #endif
 
 #define wxUSE_RICHEDIT2 0
 #endif
 

+#define wxUSE_INKEDIT 0
+

 #define wxUSE_UNICODE_MSLU 0
 
 #define wxUSE_DC_CACHEING 0
 #define wxUSE_UNICODE_MSLU 0
 
 #define wxUSE_DC_CACHEING 0


@@ -596,6 +602,10 @@
  * Use GNOME print for printing under GTK+ 2.0
  */
 #define wxUSE_LIBGNOMEPRINT 0
  * Use GNOME print for printing under GTK+ 2.0
  */
 #define wxUSE_LIBGNOMEPRINT 0

+/*
+ * Use GNOME VFS for MIME types
+ */
+#define wxUSE_LIBGNOMEVFS 0

 /*
  * Use the Hildon framework
  */
 /*
  * Use the Hildon framework
  */


@@ -1062,8 +1072,9 @@
    with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
    with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 

-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
+/* Set to 0 to disable PostScript print/preview architecture code under Windows
+  (just use Windows printing).
+ */

 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 #endif /* __WIN32__ */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 #endif /* __WIN32__ */