wxAcceleratorEntry::MatchesEvent is NOT used by wxX11

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

diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h
index bc36b30ed52737cfc63ff7e667e86193f880513a..efc1d03176b6d181d7becce81c6acba23be35544 100644 (file)
--- a/include/wx/univ/setup.h
+++ b/include/wx/univ/setup.h
@@ -16,6 +16,17 @@
 // 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
@@ -162,12 +173,9 @@
 #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
@@ -316,12 +324,9 @@
 #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
@@ -389,6 +394,7 @@
 
 #define wxUSE_CONTROLS     1
 #define wxUSE_POPUPWIN     1
+#define wxUSE_TIPWINDOW    1
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 0
@@ -482,6 +488,9 @@
 #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
@@ -492,4 +501,12 @@
 
 #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_