X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c09f28798bb9e9e8f8cd563b7b9dd24f0acc6ebd..d352e8509a69f255215d6dff93ffdc7da8dc7e5b:/include/wx/msw/setup0.h

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 05518a1c2e..1a73808f9e 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -19,6 +19,10 @@
 // define this to 0 when building wxBase library
 #define wxUSE_GUI            1
 
+// ----------------------------------------------------------------------------
+// compatibility settings
+// ----------------------------------------------------------------------------
+
 #define WXWIN_COMPATIBILITY  0
                                 // Compatibility with 1.68 API.
                                 // Level 0: no backward compatibility, all new features
@@ -26,6 +30,19 @@
                                 // the compatibility code is now very minimal so there
                                 // is little advantage to setting it to 1.
 
+// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
+// but this is very dangerous because you can mistakenly pass an icon instead
+// of a bitmap to a function taking "const wxBitmap&" - which will *not* work
+// because an icon is not a valid bitmap
+//
+// Starting from 2.1.12, you have the choice under this backwards compatible
+// behaviour (your code will still compile, but probably won't behave as
+// expected!) and not deriving wxIcon class from wxBitmap, but providing a
+// conversion ctor wxBitmap(const wxIcon&) instead.
+//
+// Recommended setting: 0
+#define wxICON_IS_BITMAP    0
+
 // ----------------------------------------------------------------------------
 // General features
 // ----------------------------------------------------------------------------
@@ -62,8 +79,6 @@
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop
 
-#define wxUSE_TOOLBAR      1
-                                // Define 1 to use toolbar classes
 #define wxUSE_BUTTONBAR    1
                                 // Define 1 to use buttonbar classes (enhanced toolbar
                                 // for MS Windows)
@@ -228,16 +243,16 @@
                                 // wxWindow::SetToolTip() method
 #define wxUSE_SOCKETS       1
                                 // Set to 1 to use socket classes
-#define wxUSE_HTML          0
+#define wxUSE_HTML          1
                                 // Set to 1 to use wxHTML sub-library
-#define wxUSE_FS_ZIP        0
-#define wxUSE_FS_INET       0   // Set to 1 to enable virtual file systems
+#define wxUSE_FS_ZIP        1
+#define wxUSE_FS_INET       1   // Set to 1 to enable virtual file systems
 
-#define wxUSE_BUSYINFO      0
+#define wxUSE_BUSYINFO      1
                                 // wxBusyInfo displays window with message
                                 // when app is busy. Works in same way as
                                 // wxBusyCursor
-#define wxUSE_ZIPSTREAM     0
+#define wxUSE_ZIPSTREAM     1
                                 // input stream for reading from zip archives
 
 /*
@@ -302,6 +317,13 @@
                                 // See note above about using FAFA and CTL3D.
 #endif
 
+// can we use RICHEDIT control?
+#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#define wxUSE_RICHEDIT 1
+#else
+#define wxUSE_RICHEDIT 0
+#endif
+
 #define wxUSE_COMMON_DIALOGS         1
                                 // On rare occasions (e.g. using DJGPP) may want
                                 // to omit common dialogs