From b7bcf0138c013d87fca2d8008666ad77eea8cf6c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 19 Jun 2000 08:00:27 +0000 Subject: [PATCH] BC++/Mingw32 patches applied git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/b32.t | 11 +++++++---- docs/html/faq.htm | 6 +++--- docs/html/faqgen.htm | 6 +++--- docs/html/faqgtk.htm | 6 +++--- docs/html/faqmac.htm | 6 +++--- docs/html/faqmsw.htm | 6 +++--- docs/html/index.htm | 8 ++++---- docs/html/logo.gif | Bin 4656 -> 3388 bytes docs/html/platform.htm | 6 +++--- docs/html/standard.htm | 6 +++--- docs/html/wxbook.htm | 6 +++--- docs/msw/install.txt | 19 ++++--------------- src/common/dlgcmn.cpp | 1 + src/generic/logg.cpp | 1 + src/generic/panelg.cpp | 5 +++-- src/generic/treelay.cpp | 2 +- src/makeprog.b32 | 2 +- src/msw/makefile.b32 | 22 ++++++++++++++-------- 18 files changed, 60 insertions(+), 59 deletions(-) diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t index 34f6377e41..3c56dcdf59 100644 --- a/distrib/msw/tmake/b32.t +++ b/distrib/msw/tmake/b32.t @@ -112,12 +112,12 @@ PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET) !endif !if "$(USE_XPM_IN_MSW)" == "1" -PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS) +PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS) PERIPH_TARGET=xpm $(PERIPH_TARGET) PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET) !endif -#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS) +#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS) PERIPH_LIBS= PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET) PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET) @@ -126,7 +126,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA DUMMY=dummy !else DUMMY=dummydll -LIBS= cw32 import32 ole2w32 +LIBS= cw32mt import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff !endif LIBTARGET=$(WXLIB) @@ -181,7 +181,7 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS) -erase $(LIBTARGET) -erase $(WXLIBDIR)\wx.dll - tlink32 $(LINK_FLAGS) /v @&&! + $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR) /v @&&! c0d32.obj $(OBJECTS) $(WXLIBDIR)\wx nul @@ -370,6 +370,9 @@ $(WIN95FLAG) clean: $(PERIPH_CLEAN_TARGET) -erase $(LIBTARGET) + -erase $(WXLIBDIR)\wx.dll + -erase $(WXLIBDIR)\wx.tds + -erase $(WXLIBDIR)\wx.il? -erase *.obj -erase *.pch -erase *.csm diff --git a/docs/html/faq.htm b/docs/html/faq.htm index cbe471dcb6..582397d58d 100644 --- a/docs/html/faq.htm +++ b/docs/html/faq.htm @@ -8,10 +8,10 @@ - +
- diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm index cdea35dd73..a4e15b4185 100644 --- a/docs/html/faqgen.htm +++ b/docs/html/faqgen.htm @@ -8,10 +8,10 @@ -
- + + wxWindows 2 FAQ
+
- diff --git a/docs/html/faqgtk.htm b/docs/html/faqgtk.htm index 1fe2c3586f..ba070ce196 100644 --- a/docs/html/faqgtk.htm +++ b/docs/html/faqgtk.htm @@ -8,10 +8,10 @@ -
- + + wxWindows 2 FAQ: General
+
- diff --git a/docs/html/faqmac.htm b/docs/html/faqmac.htm index c5ad70a4b3..434221f04d 100644 --- a/docs/html/faqmac.htm +++ b/docs/html/faqmac.htm @@ -8,10 +8,10 @@ -
- + + wxWindows 2 for GTK FAQ
+
- diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm index e5a7e96019..be0f8d9091 100644 --- a/docs/html/faqmsw.htm +++ b/docs/html/faqmsw.htm @@ -8,10 +8,10 @@ -
- + + wxWindows 2 for Mac FAQ
+
- diff --git a/docs/html/index.htm b/docs/html/index.htm index 570e420f8e..525b29a64e 100644 --- a/docs/html/index.htm +++ b/docs/html/index.htm @@ -11,11 +11,11 @@ -
- + + wxWindows 2 for Windows FAQ
+
- diff --git a/docs/html/logo.gif b/docs/html/logo.gif index 2242fffd965a2779c29b9599d4e14bf2bebe4005..d95a597121d6c1feb462e9470af5a98cb1cd9c91 100644 GIT binary patch literal 3388 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 -
- - + + +
+
- diff --git a/docs/html/standard.htm b/docs/html/standard.htm index 9bd3acac53..e1a937e3ec 100644 --- a/docs/html/standard.htm +++ b/docs/html/standard.htm @@ -9,10 +9,10 @@ -
- + + Supported Platforms
+
- diff --git a/docs/html/wxbook.htm b/docs/html/wxbook.htm index f2f2fdde53..8900967c66 100644 --- a/docs/html/wxbook.htm +++ b/docs/html/wxbook.htm @@ -8,10 +8,10 @@ -
- + + wxWindows Programmer Style Guide
+
- diff --git a/docs/msw/install.txt b/docs/msw/install.txt index 6cc2885fb4..45dd67e6e6 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -34,20 +34,8 @@ program contains the following: - Tex2RTF source; - Dialog Editor binary. -Alternatively, you may unarchive the set of .zip files by hand, -where x is the minor version number and y is the release number: - -wx2_x_y_gen.zip Generic source code and samples (required) -wx2_x_y_msw.zip Windows-specific source code and samples (required) -wx2_x_y_doc.zip Documentation source code (not required) -wx2_x_y_hlp.zip WinHelp documentation -wx2_x_y_pdf.zip Acrobat PDF documentation -wx2_x_y_htm.zip HTML documentation -wx2_x_y_vc.zip MS VC++ 5.0 project files -wx2_x_y_cw.zip Metrowerks CodeWarrior project files -wx2_x_y_bc.zip BC++ 5 project files -jpeg.zip Use this to allow wxImage to read and write JPEG files -tiff.zip Use this to allow wxImage to read and write TIFF files +Alternatively, you may unarchive the .zip form by hand: +wxMSW-x.y.z.zip where x.y.z is the version number. Unarchive the required files plus any optional documentation files into a suitable directory such as c:\wx. @@ -204,7 +192,8 @@ web site or CD-ROM. Note (6): to create your own IDE files, see the technical note on the wxWindows web site or CD-ROM, entitled "Compiling wxWindows -applications in the VC++ IDE". You can also copy .dsp and .dsw +applications in the VC++ IDE" (technical note docs/tech/tn0010.htm in the +wxWindows distribution). You can also copy .dsp and .dsw files from an existing wxWindows sample and adapt them. Visual C++ 1.5 compilation (16-bit) diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index 3cdf502335..d16c32fd0f 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -29,6 +29,7 @@ #endif #ifndef WX_PRECOMP + #include "wx/button.h" #include "wx/dialog.h" #include "wx/dcclient.h" #include "wx/intl.h" diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index 8a7532e0f9..5aec66d4ca 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -33,6 +33,7 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/button.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/menu.h" diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index 4ffdcc4dc1..346a2c82e6 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -34,10 +34,11 @@ #include "wx/colour.h" #include "wx/settings.h" #include "wx/log.h" - #include "wx/toolbar.h" - #include "wx/statusbr.h" #endif +#include "wx/toolbar.h" +#include "wx/statusbr.h" + #include "wx/generic/panelg.h" // ---------------------------------------------------------------------------- diff --git a/src/generic/treelay.cpp b/src/generic/treelay.cpp index 139899712e..947d53e6ac 100644 --- a/src/generic/treelay.cpp +++ b/src/generic/treelay.cpp @@ -21,7 +21,7 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_TREELAYOUT diff --git a/src/makeprog.b32 b/src/makeprog.b32 index 06e61fd4db..113b4fee61 100644 --- a/src/makeprog.b32 +++ b/src/makeprog.b32 @@ -30,7 +30,7 @@ OPT = -Od DEBUG_FLAGS = !endif -CPPFLAGS=$(CPP_FLAGS) $(DEBUG_FLAGS) $(OPT) @$(CFG) +CPPFLAGS=$(CPP_FLAGS) $(EXTRACPPFLAGS) $(DEBUG_FLAGS) $(DLL_FLAGS) $(OPT) @$(CFG) all: $(TARGET).exe $(EXTRATARGETS) diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 4f0d74dc0d..455e29b0e9 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -1,6 +1,6 @@ -# This file was automatically generated by tmake at 20:16, 2000/03/31 +# This file was automatically generated by tmake at 09:26, 2000/06/19 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # @@ -51,12 +51,12 @@ PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET) !endif !if "$(USE_XPM_IN_MSW)" == "1" -PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS) +PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS) PERIPH_TARGET=xpm $(PERIPH_TARGET) PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET) !endif -#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS) +#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS) PERIPH_LIBS= PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET) PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET) @@ -65,7 +65,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA DUMMY=dummy !else DUMMY=dummydll -LIBS= cw32 import32 ole2w32 +LIBS= cw32mt import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff !endif LIBTARGET=$(WXLIB) @@ -97,6 +97,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\scrolwin.obj \ $(MSWDIR)\splitter.obj \ $(MSWDIR)\statusbr.obj \ + $(MSWDIR)\tabg.obj \ $(MSWDIR)\tbarsmpl.obj \ $(MSWDIR)\textdlgg.obj \ $(MSWDIR)\tipdlg.obj \ @@ -264,8 +265,8 @@ MSWOBJS = $(MSWDIR)\accel.obj \ $(MSWDIR)\glcanvas.obj \ $(MSWDIR)\gsocket.obj \ $(MSWDIR)\gsockmsw.obj \ - $(MSWDIR)\helpwin.obj \ $(MSWDIR)\helpchm.obj \ + $(MSWDIR)\helpwin.obj \ $(MSWDIR)\icon.obj \ $(MSWDIR)\imaglist.obj \ $(MSWDIR)\joystick.obj \ @@ -360,7 +361,7 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS) -erase $(LIBTARGET) -erase $(WXLIBDIR)\wx.dll - tlink32 $(LINK_FLAGS) /v @&&! + $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR) /v @&&! c0d32.obj $(OBJECTS) $(WXLIBDIR)\wx nul @@ -392,6 +393,8 @@ $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF) $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF) +$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF) + $(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF) $(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF) @@ -518,8 +521,6 @@ $(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF) $(MSWDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF) -$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF) - $(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF) $(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF) @@ -837,6 +838,8 @@ $(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF) $(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF) +$(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF) + $(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF) $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF) @@ -999,6 +1002,9 @@ $(WIN95FLAG) clean: $(PERIPH_CLEAN_TARGET) -erase $(LIBTARGET) + -erase $(WXLIBDIR)\wx.dll + -erase $(WXLIBDIR)\wx.tds + -erase $(WXLIBDIR)\wx.il? -erase *.obj -erase *.pch -erase *.csm
- + + wxWindows Book