Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-06-29 16:30:51 +00:00
parent 1eb9ac3c66
commit cbf656555e
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distrib/msw/msw.rsp
View File

@@ -64,6 +64,7 @@ src/msw/*.inc
src/msw/winestub.c src/msw/winestub.c
src/msw/gsocket.c src/msw/gsocket.c
src/msw/gsockmsw.c src/msw/gsockmsw.c
src/msw/version.rc
src/msw/ole/*.cpp src/msw/ole/*.cpp
src/msw/*.prj src/msw/*.prj

4
include/wx/chkconf.h
View File

@@ -457,7 +457,7 @@
#endif /* wxUSE_COMBOBOX */ #endif /* wxUSE_COMBOBOX */
#if !wxUSE_FILEDLG #if !wxUSE_FILEDLG
# if defined(wxUSE_DOC_VIEW_ARCHITECTURE) || defined(wxUSE_HTML) # if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_HTML
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxFileDialog must be compiled as well" # error "wxFileDialog must be compiled as well"
# else # else
@@ -468,7 +468,7 @@
#endif /* wxUSE_FILEDLG */ #endif /* wxUSE_FILEDLG */
#if !wxUSE_FONTDLG #if !wxUSE_FONTDLG
# if defined(wxUSE_FONTMAP) # if wxUSE_FONTMAP
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxFontDialog must be compiled as well" # error "wxFontDialog must be compiled as well"
# else # else

5
include/wx/univ/setup.h
View File

@@ -71,12 +71,14 @@
#define wxUSE_POPUPWIN 1 #define wxUSE_POPUPWIN 1
#define wxUSE_BUTTON 1 #define wxUSE_BUTTON 1
#define wxUSE_BMPBUTTON 1 #define wxUSE_BMPBUTTON 1
#define wxUSE_CALENDARCTRL 0
#define wxUSE_CARET 1 #define wxUSE_CARET 1
#define wxUSE_CHECKBOX 1 #define wxUSE_CHECKBOX 1
#define wxUSE_CHECKLISTBOX 1 #define wxUSE_CHECKLISTBOX 1
#define wxUSE_CHOICE 0 #define wxUSE_CHOICE 0
#define wxUSE_COMBOBOX 1 #define wxUSE_COMBOBOX 1
#define wxUSE_GAUGE 1 #define wxUSE_GAUGE 1
#define wxUSE_IMAGLIST 1
#define wxUSE_LISTBOX 1 #define wxUSE_LISTBOX 1
#define wxUSE_LISTCTRL 0 #define wxUSE_LISTCTRL 0
#define wxUSE_RADIOBOX 1 #define wxUSE_RADIOBOX 1
@@ -113,6 +115,9 @@
#define wxUSE_CHOICEDLG 0 #define wxUSE_CHOICEDLG 0
#define wxUSE_NUMBERDLG 0 #define wxUSE_NUMBERDLG 0
#define wxUSE_STARTUP_TIPS 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_METAFILE 0
#define wxUSE_ENH_METAFILE 0 #define wxUSE_ENH_METAFILE 0

1
src/makeb32.env
View File

@@ -8,6 +8,7 @@ WXLIBDIR = $(WXDIR)\lib
WXLIBDIR2 = $(WXDIR)\contrib\lib WXLIBDIR2 = $(WXDIR)\contrib\lib
WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc; WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;
WIN95FLAG = -D__WIN95__ -D__WINDOWS__ WIN95FLAG = -D__WIN95__ -D__WINDOWS__
RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src
# This should be changed to tlink32 if ilink32 is not available. # This should be changed to tlink32 if ilink32 is not available.
# Ilink32 is available on BC++ 5.02 and above, and all # Ilink32 is available on BC++ 5.02 and above, and all