Corrections to config checking; tweaking wxUniv's setup.h; added fix to makeb32.env

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

diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index fdfb0a1a5b27308049d46234bd6b18c45299e206..40b85a13af3d94fb66c316a24e907d62de24d93a 100644 (file)
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -64,6 +64,7 @@ src/msw/*.inc
 src/msw/winestub.c
 src/msw/gsocket.c
 src/msw/gsockmsw.c
+src/msw/version.rc
 
 src/msw/ole/*.cpp
 src/msw/*.prj

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 834520a36bbab8f2a33278ce0a3f2c1d1c9031d6..7a03b31938ffb895405cf0ed7908f8c75d6a05ad 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -457,7 +457,7 @@
 #endif /* wxUSE_COMBOBOX */
 
 #if !wxUSE_FILEDLG
-#   if defined(wxUSE_DOC_VIEW_ARCHITECTURE) || defined(wxUSE_HTML)
+#   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_HTML
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxFileDialog must be compiled as well"
 #       else
@@ -468,7 +468,7 @@
 #endif /* wxUSE_FILEDLG */
 
 #if !wxUSE_FONTDLG
-#   if defined(wxUSE_FONTMAP)
+#   if wxUSE_FONTMAP
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxFontDialog must be compiled as well"
 #       else

diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h
index 8eaf51ad29932c26d03a84ec2509f6107f2a51ea..3b65f797092e668f2b189a39d5fc11e2c13e79d0 100644 (file)
--- a/include/wx/univ/setup.h
+++ b/include/wx/univ/setup.h
@@ -71,12 +71,14 @@
 #define wxUSE_POPUPWIN     1
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
+#define wxUSE_CALENDARCTRL 0
 #define wxUSE_CARET        1
 #define wxUSE_CHECKBOX     1
 #define wxUSE_CHECKLISTBOX 1
 #define wxUSE_CHOICE       0
 #define wxUSE_COMBOBOX     1
 #define wxUSE_GAUGE        1
+#define wxUSE_IMAGLIST     1
 #define wxUSE_LISTBOX      1
 #define wxUSE_LISTCTRL     0
 #define wxUSE_RADIOBOX     1
@@ -113,6 +115,9 @@
 #define wxUSE_CHOICEDLG 0
 #define wxUSE_NUMBERDLG 0
 #define wxUSE_STARTUP_TIPS 0
+#define wxUSE_MSGDLG       1
+#define wxUSE_SPLITTER     1
+#define wxUSE_TAB_DIALOG   0
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0

diff --git a/src/makeb32.env b/src/makeb32.env
index fc27bf6bb0a966cdf248ca7ea62ae2e6a1ac9286..dd0cf6467f3bfc619c3daa84965b23a08414a7b0 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -8,6 +8,7 @@ WXLIBDIR = $(WXDIR)\lib
 WXLIBDIR2 = $(WXDIR)\contrib\lib
 WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
+RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src
 
 # This should be changed to tlink32 if ilink32 is not available.
 # Ilink32 is available on BC++ 5.02 and above, and all