removed wxUSE_IMAGE_LOADING_IN_MSW and wxUSE_RESOURCE_LOADING_IN_MSW settings, they...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 4b73caeb91dab69c7b7949f41cf6308c0f9caae1..820338996b01629a8a66ea99e8f4601dce6676be 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -859,12 +859,6 @@
                                 // supported this makes easier the issue
                                 // of portable icons and bitmaps.
 
-#define wxUSE_IMAGE_LOADING_IN_MSW        1
-                                // Use dynamic DIB loading/saving code in utils/dib under MSW.
-#define wxUSE_RESOURCE_LOADING_IN_MSW     1
-                                // Use dynamic icon/cursor loading/saving code
-                                // under MSW.
-
 // use wxExpr (a.k.a. PrologIO)
 #define wxUSE_PROLOGIO          0
 

diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp
index d4ae0b4164368ee2837fd58ff3e8515d9ec8f614..2db4053acfa7c21dbd304bf6b41ecab58dd7f029 100644 (file)
--- a/src/msw/tbarmsw.cpp
+++ b/src/msw/tbarmsw.cpp
@@ -34,10 +34,6 @@
 
 #if wxUSE_TOOLBAR && defined(__WIN16__)
 
-#if !defined(__WIN32__) && !wxUSE_IMAGE_LOADING_IN_MSW
-    #error wxToolBar needs wxUSE_IMAGE_LOADING_IN_MSW under Win16
-#endif
-
 #if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
     #include "malloc.h"
 #endif