removed redundant code

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

diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h
index 8d42edaf181d2f652d1869a44f90f3e969752439..18731483078784d7892192c1b12a097536260d65 100644 (file)
--- a/include/wx/univ/setup.h
+++ b/include/wx/univ/setup.h
@@ -16,6 +16,17 @@
 // not all ports implement 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


@@ -65,7 +76,7 @@
 #define wxUSE_TEXTFILE            0
 #define wxUSE_INTL                0
 #define wxUSE_MENUS 0 // was 1
 #define wxUSE_TEXTFILE            0
 #define wxUSE_INTL                0
 #define wxUSE_MENUS 0 // was 1

-#define wxUSE_TOOLBAR 0
+#define wxUSE_TOOLBAR 1

 #define wxUSE_TOOLBAR_NATIVE 0
 #define wxUSE_TOOLBAR_SIMPLE 0
 #define wxUSE_NOTEBOOK 1
 #define wxUSE_TOOLBAR_NATIVE 0
 #define wxUSE_TOOLBAR_SIMPLE 0
 #define wxUSE_NOTEBOOK 1


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


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


@@ -218,7 +227,7 @@
 #define wxUSE_TEXTFILE            0
 #define wxUSE_INTL                0
 #define wxUSE_MENUS        1
 #define wxUSE_TEXTFILE            0
 #define wxUSE_INTL                0
 #define wxUSE_MENUS        1

-#define wxUSE_TOOLBAR      0
+#define wxUSE_TOOLBAR      1

 #define wxUSE_TOOLBAR_NATIVE 0
 #define wxUSE_TOOLBAR_SIMPLE 0
 #define wxUSE_NOTEBOOK     1
 #define wxUSE_TOOLBAR_NATIVE 0
 #define wxUSE_TOOLBAR_SIMPLE 0
 #define wxUSE_NOTEBOOK     1


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


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


@@ -376,7 +383,7 @@
 #define wxUSE_TEXTBUFFER          0
 #define wxUSE_INTL                0
 #define wxUSE_MENUS 1
 #define wxUSE_TEXTBUFFER          0
 #define wxUSE_INTL                0
 #define wxUSE_MENUS 1

-#define wxUSE_TOOLBAR 0
+#define wxUSE_TOOLBAR 1

 #define wxUSE_TOOLBAR_NATIVE 0
 #define wxUSE_TOOLBAR_SIMPLE 0
 #define wxUSE_NOTEBOOK 1
 #define wxUSE_TOOLBAR_NATIVE 0
 #define wxUSE_TOOLBAR_SIMPLE 0
 #define wxUSE_NOTEBOOK 1


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


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


@@ -490,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_