Compilation fixes for Nano-X

[wxWidgets.git] / include / wx / univ / setup.h

diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h
index 197d646c420d3ab178918c9001c21a86a4e6d67e..efc1d03176b6d181d7becce81c6acba23be35544 100644 (file)
--- a/include/wx/univ/setup.h
+++ b/include/wx/univ/setup.h
@@ -13,8 +13,20 @@
 #define _WX_UNIV_SETUP_H_
 
 // ----------------------------------------------------------------------------
 #define _WX_UNIV_SETUP_H_
 
 // ----------------------------------------------------------------------------

-// undef everything
+// not all ports implement everything...

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

+
+// FIXME: why do we have different sections for Mac/OS2/the rest? Most settings
+//        should have the same value, like this it's a real pain to update this
+//        file...
+
+#define wxUSE_DYNAMIC_LOADER 0
+
+#define wxUSE_PROTOCOL 0
+#define wxUSE_URL 0
+
+#define wxUSE_UNICODE_MSLU 0
+

 #if defined(__WXMAC__)
 
 #define wxUSE_GUI            1
 #if defined(__WXMAC__)
 
 #define wxUSE_GUI            1


@@ -75,6 +87,7 @@
 
 #define wxUSE_CONTROLS     1
 #define wxUSE_POPUPWIN     1
 
 #define wxUSE_CONTROLS     1
 #define wxUSE_POPUPWIN     1

+#define wxUSE_TIPWINDOW    1

 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 0
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 0


@@ -160,12 +173,9 @@
 #define wxODBC_BACKWARD_COMPATABILITY 0
 #define REMOVE_UNUSED_ARG   1
 #define wxUSE_IOSTREAMH     0
 #define wxODBC_BACKWARD_COMPATABILITY 0
 #define REMOVE_UNUSED_ARG   1
 #define wxUSE_IOSTREAMH     0

-#define wxUSE_LIBPNG        0
-#define wxUSE_LIBJPEG       0
-#define wxUSE_LIBTIFF       0
-#define wxUSE_GIF           0
-#define wxUSE_PNM           0
-#define wxUSE_PCX           0
+
+#define wxUSE_ICO_CUR       1
+

 #define wxUSE_MFC           0
 #define wxUSE_OLE           0
 #define wxUSE_CTL3D                      0
 #define wxUSE_MFC           0
 #define wxUSE_OLE           0
 #define wxUSE_CTL3D                      0


@@ -228,6 +238,7 @@
 
 #define wxUSE_CONTROLS     1
 #define wxUSE_POPUPWIN     1
 
 #define wxUSE_CONTROLS     1
 #define wxUSE_POPUPWIN     1

+#define wxUSE_TIPWINDOW    1

 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 0
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 0


@@ -313,12 +324,9 @@
 #define wxODBC_BACKWARD_COMPATABILITY 0
 #define REMOVE_UNUSED_ARG   1
 #define wxUSE_IOSTREAMH     0
 #define wxODBC_BACKWARD_COMPATABILITY 0
 #define REMOVE_UNUSED_ARG   1
 #define wxUSE_IOSTREAMH     0

-#define wxUSE_LIBPNG        0
-#define wxUSE_LIBJPEG       0
-#define wxUSE_LIBTIFF       0
-#define wxUSE_GIF           0
-#define wxUSE_PNM           0
-#define wxUSE_PCX           0
+
+#define wxUSE_ICO_CUR       1
+

 #define wxUSE_MFC           0
 #define wxUSE_OLE           0
 #define wxUSE_CTL3D         0
 #define wxUSE_MFC           0
 #define wxUSE_OLE           0
 #define wxUSE_CTL3D         0


@@ -329,7 +337,7 @@
 #define wxUSE_REGEX         0
 #define wxUSE_STATUSBAR     1
 
 #define wxUSE_REGEX         0
 #define wxUSE_STATUSBAR     1
 

-#else
+#else // !Mac, !OS2

 
 #define wxUSE_GUI            1
 #define WXWIN_COMPATIBILITY  0
 
 #define wxUSE_GUI            1
 #define WXWIN_COMPATIBILITY  0


@@ -372,6 +380,7 @@
 #define wxUSE_FILE                1
 #define wxUSE_FFILE               1
 #define wxUSE_TEXTFILE            0
 #define wxUSE_FILE                1
 #define wxUSE_FFILE               1
 #define wxUSE_TEXTFILE            0

+#define wxUSE_TEXTBUFFER          0

 #define wxUSE_INTL                0
 #define wxUSE_MENUS 1
 #define wxUSE_TOOLBAR 0
 #define wxUSE_INTL                0
 #define wxUSE_MENUS 1
 #define wxUSE_TOOLBAR 0


@@ -385,6 +394,7 @@
 
 #define wxUSE_CONTROLS     1
 #define wxUSE_POPUPWIN     1
 
 #define wxUSE_CONTROLS     1
 #define wxUSE_POPUPWIN     1

+#define wxUSE_TIPWINDOW    1

 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 0
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 0


@@ -437,6 +447,7 @@
 #define wxUSE_SPLITTER     1
 #define wxUSE_TAB_DIALOG   0
 
 #define wxUSE_SPLITTER     1
 #define wxUSE_TAB_DIALOG   0
 

+#define wxUSE_SPLASH 1

 #define wxUSE_JOYSTICK 0
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
 #define wxUSE_JOYSTICK 0
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0


@@ -477,6 +488,9 @@
 #define wxUSE_GIF           0
 #define wxUSE_PNM           0
 #define wxUSE_PCX           0
 #define wxUSE_GIF           0
 #define wxUSE_PNM           0
 #define wxUSE_PCX           0

+
+#define wxUSE_ICO_CUR       1
+

 #define wxUSE_MFC           0
 #define wxUSE_OLE           0
 #define wxUSE_CTL3D                      0
 #define wxUSE_MFC           0
 #define wxUSE_OLE           0
 #define wxUSE_CTL3D                      0


@@ -487,4 +501,12 @@
 
 #define wxUSE_PALETTE 0
 
 
 #define wxUSE_PALETTE 0
 

+#define wxUSE_LIBPNG        0
+#define wxUSE_LIBJPEG       0
+#define wxUSE_LIBTIFF       0
+#define wxUSE_IFF           0
+#define wxUSE_GIF           0
+#define wxUSE_PNM           0
+#define wxUSE_PCX           0
+

 #endif // _WX_UNIV_SETUP_H_
 #endif // _WX_UNIV_SETUP_H_