From 176513eb420627187a2ad86ef28e103301d21640 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 25 Jan 2000 15:51:26 +0000 Subject: [PATCH] more patches for BC++ from Ricky Gonzales git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/b32.t | 26 +++++++++++++++++++++++--- distrib/msw/tmake/filelist.txt | 7 ++++--- src/motif/frame.cpp | 1 + src/msw/makefile.b32 | 34 ++++++++++++++++++++++++++++++---- src/msw/radiobox.cpp | 3 --- 5 files changed, 58 insertions(+), 13 deletions(-) diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t index c81b74c2f7..49c6f27c56 100644 --- a/distrib/msw/tmake/b32.t +++ b/distrib/msw/tmake/b32.t @@ -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 diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index d5b4fc4c94..72680ad2d4 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -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 diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index 54a0466fff..3e4095b159 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -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 diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 62c3bde3d2..d115106b26 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -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 diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index f91948a2db..96cc7b42b9 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -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__ -- 2.45.2