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

more patches for BC++ from Ricky Gonzales

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-01-25 15:51:26 +00:00
parent 4a539480fb
commit 176513eb42
5 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
distrib/msw/tmake/b32.t
View File

@ -97,7 +97,7 @@ WXBUILDDLL=1
# Please set these according to the settings in wx_setup.h, so we can include
# the appropriate libraries in wx.lib
USE_CTL3D=0
USE_XPM_IN_MSW=0
USE_XPM_IN_MSW=1
PERIPH_LIBS=
PERIPH_TARGET=
@ -118,8 +118,8 @@ PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS)
PERIPH_LIBS=
PERIPH_TARGET=zlib png jpeg $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg $(PERIPH_CLEAN_TARGET)
PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET)
!if "$(DLL)" == "0"
DUMMY=dummy
@ -320,6 +320,26 @@ clean_jpeg:
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
xpm: $(CFG)
cd $(WXDIR)\src\xpm
make -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_xpm:
cd $(WXDIR)\src\xpm
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
tiff: $(CFG)
cd $(WXDIR)\src\tiff
make -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_tiff:
cd $(WXDIR)\src\tiff
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
$(CFG): makefile.b32
copy &&!
-H=$(WXDIR)\src\msw\wx32.csm

7
distrib/msw/tmake/filelist.txt
View File

@ -258,7 +258,7 @@ mdi.cpp M
menu.cpp M
menuitem.cpp M
metafile.cpp M
mimetype.cpp M
mimetype.cpp M 32,B
minifram.cpp M
msgdlg.cpp M
nativdlg.cpp M
@ -307,7 +307,7 @@ dialup.cpp U
dir.cpp U B
fontenum.cpp U
fontutil.cpp U
mimetype.cpp U
mimetype.cpp U B
threadpsx.cpp U B
utilsunx.cpp U B
gsocket.c U
@ -898,6 +898,7 @@ mdi.h 9
menu.h 9
menuitem.h 9
metafile.h 9
mimetype.h 9 32,B
minifram.h 9
msgdlg.h 9
msvcrt.h 9
@ -1037,7 +1038,7 @@ statbox.h 2
fontutil.h S
execute.h S
mimetype.h S
mimetype.h S B
gsockunx.h S
file.h P

1
src/motif/frame.cpp
View File

@ -31,6 +31,7 @@
#include "wx/settings.h"
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/log.h"
#ifdef __VMS__
#pragma message disable nosimpint

34
src/msw/makefile.b32
View File

@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 14:31, 2000/01/19
# This file was automatically generated by tmake at 17:08, 2000/01/24
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
#
@ -37,7 +37,7 @@ WXBUILDDLL=1
# Please set these according to the settings in wx_setup.h, so we can include
# the appropriate libraries in wx.lib
USE_CTL3D=0
USE_XPM_IN_MSW=0
USE_XPM_IN_MSW=1
PERIPH_LIBS=
PERIPH_TARGET=
@ -58,8 +58,8 @@ PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS)
PERIPH_LIBS=
PERIPH_TARGET=zlib png jpeg $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg $(PERIPH_CLEAN_TARGET)
PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET)
!if "$(DLL)" == "0"
DUMMY=dummy
@ -127,6 +127,7 @@ COMMONOBJS = \
$(MSWDIR)\dbtable.obj \
$(MSWDIR)\dcbase.obj \
$(MSWDIR)\dlgcmn.obj \
$(MSWDIR)\dndcmn.obj \
$(MSWDIR)\dobjcmn.obj \
$(MSWDIR)\docmdi.obj \
$(MSWDIR)\docview.obj \
@ -147,6 +148,7 @@ COMMONOBJS = \
$(MSWDIR)\fs_zip.obj \
$(MSWDIR)\ftp.obj \
$(MSWDIR)\gdicmn.obj \
$(MSWDIR)\geometry.obj \
$(MSWDIR)\gifdecod.obj \
$(MSWDIR)\hash.obj \
$(MSWDIR)\helpbase.obj \
@ -605,6 +607,8 @@ $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
$(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
$(MSWDIR)\dndcmn.obj: $(COMMDIR)\dndcmn.$(SRCSUFF)
$(MSWDIR)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
$(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
@ -645,6 +649,8 @@ $(MSWDIR)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF)
$(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
$(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
$(MSWDIR)\gifdecod.obj: $(COMMDIR)\gifdecod.$(SRCSUFF)
$(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
@ -920,6 +926,26 @@ clean_jpeg:
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
xpm: $(CFG)
cd $(WXDIR)\src\xpm
make -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_xpm:
cd $(WXDIR)\src\xpm
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
tiff: $(CFG)
cd $(WXDIR)\src\tiff
make -f makefile.b32 lib
cd $(WXDIR)\src\msw
clean_tiff:
cd $(WXDIR)\src\tiff
make -f makefile.b32 clean
cd $(WXDIR)\src\msw
$(CFG): makefile.b32
copy &&!
-H=$(WXDIR)\src\msw\wx32.csm

3
src/msw/radiobox.cpp
View File

@ -789,7 +789,6 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
{
long lDlgCode = ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd,
message, wParam, lParam);
//CallWindowProc(CASTWNDPROC gs_wndprocToolTip, hwndTT, msg, wParam, lParam);
return lDlgCode | DLGC_WANTARROWS;
}
@ -875,8 +874,6 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
}
return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);
}
#endif // __WIN32__