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 2242fffd96..d95a597121 100644 Binary files a/docs/html/logo.gif and b/docs/html/logo.gif differ diff --git a/docs/html/platform.htm b/docs/html/platform.htm index 727924497b..0fa514f1d6 100644 --- a/docs/html/platform.htm +++ b/docs/html/platform.htm @@ -8,10 +8,10 @@ -
- - + + +
+
- 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