Lots of updates for color dialog and sliders

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

diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h
index 6bbef6b038dbef654a7bc3e58869d114cefe4dac..18731483078784d7892192c1b12a097536260d65 100644 (file)
--- a/include/wx/univ/setup.h
+++ b/include/wx/univ/setup.h
@@ -76,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


@@ -173,12 +173,6 @@
 #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_ICO_CUR       1
 


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


@@ -330,12 +324,6 @@
 #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_ICO_CUR       1
 


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


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