Tidied some docs, made VC++ 6 DLL compilation work with wxvc_dll.dsp,

removed wxvc6.dsp, updated projgen, small fixes for OGL


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/msw/vc.rsp

@@ -139,8 +139,8 @@ utils/dialoged/src/DialogEdVC.dsw
 utils/tex2rtf/src/Tex2RTFVC.dsp
 utils/tex2rtf/src/Tex2RTFVC.dsw
 
-utils/glcanvas/win/GlcanvasVC.dsp
+utils/glcanvas/win/Glcanvas*.dsp
-utils/glcanvas/win/GlcanvasVC.dsw
+utils/glcanvas/win/Glcanvas*.dsw
 utils/glcanvas/samples/cube/CubeVC.dsp
 utils/glcanvas/samples/cube/CubeVC.dsw
 utils/glcanvas/samples/isosurf/IsosurfVC.dsp

docs/latex/wx/boxsizer.tex

@@ -82,7 +82,7 @@ MyDialog::MyDialog(wxFrame *parent, wxWindowID id, const wxString &title ) :
 
 \wxheading{Derived from}
 
-\helpref{wxSizer}{wxsizer}
+\helpref{wxSizer}{wxsizer}\\
 \helpref{wxObject}{wxobject}
 
 \membersection{wxBoxSizer::wxBoxSizer}\label{wxboxsizerwxboxsizer}

docs/latex/wx/classes.tex

@@ -9,15 +9,15 @@
 \input array.tex
 \input arrstrng.tex
 \input autoobj.tex
+\input bitmap.tex
+\input bbutton.tex
+\input bmpdatob.tex
 \input boxsizer.tex
+\input brush.tex
 \input busycurs.tex
 \input busyinfo.tex
 \input button.tex
 \input strmbfrd.tex
-\input bitmap.tex
-\input bbutton.tex
-\input bmpdatob.tex
-\input brush.tex
 \input calclevt.tex
 \input checkbox.tex
 \input checklst.tex

docs/latex/wx/conditn.tex

@@ -1,6 +1,6 @@
 \section{\class{wxCondition}}\label{wxcondition}
 
-TODO
+Condition class for code protection in multithreaded applications.
 
 \wxheading{Derived from}
 
@@ -62,4 +62,3 @@ Waits until a signal is raised or the timeout has elapsed.
 
 The second form returns if the signal was raised, or FALSE if there was a timeout.
 
-

docs/latex/wx/critsect.tex

@@ -1,6 +1,6 @@
 \section{\class{wxCriticalSection}}\label{wxcriticalsection}
 
-A critical section object is used exactly for the same purpose as 
+A critical section object is used for the same exactly purpose as 
 \helpref{mutexes}{wxMutex}. The only difference is that under Windows platform
 critical sections are only visible inside one process, while mutexes may be
 shared between processes, so using critical sections is slightly more

docs/latex/wx/datstrm.tex

@@ -31,6 +31,10 @@ For example:
 
 See also \helpref{wxDataOutputStream}{wxdataoutputstream}. 
 
+\wxheading{Derived from}
+
+None
+
 \wxheading{Include files}
 
 <wx/datstrm.h>
@@ -114,6 +118,10 @@ usage and caveats.
 
 See also \helpref{wxDataInputStream}{wxdatainputstream}. 
 
+\wxheading{Derived from}
+
+None
+
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 \membersection{wxDataOutputStream::wxDataOutputStream}\label{wxdataoutputstreamconstr}

docs/latex/wx/filesys.tex

@@ -5,9 +5,9 @@
 
 \section{\class{wxFileSystem}}\label{wxfilesystem}
 
-This class provides interface for opening files on different
+This class provides an interface for opening files on different
 file systems. It can handle absolute and/or local filenames.
-It uses system of \helpref{handlers}{wxfilesystemhandler} to
+It uses a system of \helpref{handlers}{wxfilesystemhandler} to
 provide access to user-defined virtual file systems.
 
 \wxheading{Derived from}

docs/latex/wx/filesysh.tex

@@ -5,11 +5,11 @@
 
 \section{\class{wxFileSystemHandler}}\label{wxfilesystemhandler}
 
-wxFileSystemHandler (or derived classes to be exact) is used
+Classes derived from wxFileSystemHandler are used
-to access virtual file systems. It's public interface consists
+to access virtual file systems. Its public interface consists
-from two methods: \helpref{CanOpen}{wxfilesystemhandlercanopen}
+of two methods: \helpref{CanOpen}{wxfilesystemhandlercanopen} 
 and \helpref{OpenFile}{wxfilesystemhandleropenfile}. 
-It provides additional protected methods to simplify process
+It provides additional protected methods to simplify the process
 of opening the file: GetProtocol, GetLeftLocation, GetRightLocation,
 GetAnchor, GetMimeTypeFromExt.
 
@@ -18,13 +18,11 @@ are constructed.
 
 \wxheading{Notes}
 
-\begin{itemize}
+\begin{itemize}\itemsep=0pt
 \item The handlers are shared by all instances of wxFileSystem.
-
 \item wxHTML library provides handlers for local files and HTTP or FTP protocol
-
 \item The {\it location} parameter passed to OpenFile or CanOpen methods
-is always {\bf absolute} path. You don't need to check the FS's current path!
+is always an {\bf absolute} path. You don't need to check the FS's current path.
 \end{itemize}
 
 \wxheading{Derived from}
@@ -47,8 +45,8 @@ Constructor.
 
 \func{virtual bool}{CanOpen}{\param{const wxString\& }{location}}
 
-Returns TRUE if the handler is able to open this file (this function doesn't
+Returns TRUE if the handler is able to open this file. This function doesn't
-check whether the file exists or not, it only checks if it knows the protocol).
+check whether the file exists or not, it only checks if it knows the protocol.
 Example:
 
 \begin{verbatim}
@@ -58,24 +56,24 @@ bool MyHand::CanOpen(const wxString& location)
 }
 \end{verbatim}
 
-Must be overwriten in derived handlers.
+Must be overridden in derived handlers.
 
 \membersection{wxFileSystemHandler::GetAnchor}\label{wxfilesystemhandlergetanchor}
 
 \constfunc{wxString}{GetAnchor}{\param{const wxString\& }{location}}
 
-Returns anchor if present in the location.
+Returns the anchor if present in the location.
 See \helpref{wxFSFile}{wxfsfilegetanchor} for details.
 
 Example: GetAnchor("index.htm\#chapter2") == "chapter2"
 
-{\bf Note:} anchor is NOT part of left location.
+{\bf Note:} the anchor is NOT part of the left location.
 
 \membersection{wxFileSystemHandler::GetLeftLocation}\label{wxfilesystemhandlergetleftlocation}
 
 \constfunc{wxString}{GetLeftLocation}{\param{const wxString\& }{location}}
 
-Returns left location string extracted from {\it location}. 
+Returns the left location string extracted from {\it location}. 
 
 Example: GetLeftLocation("file:myzipfile.zip\#zip:index.htm") == "file:myzipfile.zip"
 
@@ -83,8 +81,8 @@ Example: GetLeftLocation("file:myzipfile.zip\#zip:index.htm") == "file:myzipfile
 
 \func{wxString}{GetMimeTypeFromExt}{\param{const wxString\& }{location}}
 
-Returns MIME type based on {\bf extension} of {\it location}. (While wxFSFile::GetMimeType
+Returns the MIME type based on {\bf extension} of {\it location}. (While wxFSFile::GetMimeType
-returns real MIME type - either extension-based or queried from HTTP)
+returns real MIME type - either extension-based or queried from HTTP.)
 
 Example : GetMimeTypeFromExt("index.htm") == "text/html"
 
@@ -92,7 +90,7 @@ Example : GetMimeTypeFromExt("index.htm") == "text/html"
 
 \constfunc{wxString}{GetProtocol}{\param{const wxString\& }{location}}
 
-Returns protocol string extracted from {\it location}. 
+Returns the protocol string extracted from {\it location}. 
 
 Example: GetProtocol("file:myzipfile.zip\#zip:index.htm") == "zip"
 
@@ -100,14 +98,10 @@ Example: GetProtocol("file:myzipfile.zip\#zip:index.htm") == "zip"
 
 \constfunc{wxString}{GetRightLocation}{\param{const wxString\& }{location}}
 
-Returns right location string extracted from {\it location}. 
+Returns the right location string extracted from {\it location}. 
 
 Example : GetRightLocation("file:myzipfile.zip\#zip:index.htm") == "index.htm"
 
-
-
-
-
 \membersection{wxFileSystemHandler::FindFirst}\label{wxfilesystemfindfirst}
 
 \func{virtual wxString}{FindFirst}{\param{const wxString\& }{wildcard}, \param{int }{flags = 0}}
@@ -125,9 +119,7 @@ This method is only called if \helpref{CanOpen}{wxfilesystemhandlercanopen} retu
 Returns next filename that matches parameters passed to \helpref{FindFirst}{wxfilesystemfindfirst}.
 
 This method is only called if \helpref{CanRead}{wxfilesystemhandlercanread} returns TRUE and FindFirst
-returned non-empty string.
+returned a non-empty string.
-
-
 
 \membersection{wxFileSystemHandler::OpenFile}\label{wxfilesystemhandleropenfile}
 
@@ -135,12 +127,12 @@ returned non-empty string.
 
 Opens the file and returns wxFSFile pointer or NULL if failed.
 
-Must be overwriten in derived handlers.
+Must be overridden in derived handlers.
 
 \wxheading{Parameters}
 
 \docparam{fs}{Parent FS (the FS from that OpenFile was called). See ZIP handler
-for details how to use it.}
+for details of how to use it.}
 
 \docparam{location}{The {\bf absolute} location of file.}
 

docs/latex/wx/filetype.tex

@@ -1,6 +1,6 @@
 \section{\class{wxFileType}}\label{wxfiletype}
 
-This class holds information about a given "file type". File type is the same as
+This class holds information about a given {\it file type}. File type is the same as
 MIME type under Unix, but under Windows it corresponds more to an extension than
 to MIME type (in fact, several extensions may correspond to a file type). This
 object may be created in several different ways: the program might know the file
@@ -13,14 +13,14 @@ will be returned if the corresponding information couldn't be found.
 The objects of this class are never created by the application code but are
 returned by \helpref{wxMimeTypesManager::GetFileTypeFromMimeType}{wxmimetypesmanagergetfiletypefrommimetype} and 
 \helpref{wxMimeTypesManager::GetFileTypeFromExtension}{wxmimetypesmanagergetfiletypefromextension} methods.
-But it's your responsability to delete the returned pointer when you're done
+But it's your responsibility to delete the returned pointer when you're done
 with it!
 
 % TODO describe MIME types better than this...
-A brief remainder about what the MIME types are (see the RFC 1341 for more
+A brief reminder about what the MIME types are (see the RFC 1341 for more
-information): basicly, it is just a pair category/type (for example,
+information): basically, it is just a pair category/type (for example,
-"text/plain") where the category is a basic indication of what a file is
+"text/plain") where the category is a basic indication of what a file is.
-(examples of categories are "application", "image", "text", "binary"...) and
+Examples of categories are "application", "image", "text", "binary", and
 type is a precise definition of the document format: "plain" in the example
 above means just ASCII text without any formatting, while "text/html" is the
 HTML document source.
@@ -31,7 +31,7 @@ typically correspond to the extension ".txt", but may as well be associated with
 
 \wxheading{Derived from}
 
-No base class.
+None
 
 \wxheading{Include files}
 

docs/latex/wx/fltinstr.tex

@@ -3,6 +3,10 @@
 % -----------------------------------------------------------------------------
 \section{\class{wxFilterInputStream}}\label{wxfilterinputstream}
 
+A filter stream has the capability of a normal stream but it can be placed on top
+of another stream. So, for example, it can uncompress, uncrypt the datas which are read
+from another stream and pass it to the requester.
+
 \wxheading{Derived from}
 
 \helpref{wxInputStream}{wxinputstream}\\
@@ -24,8 +28,5 @@ differs and it is documented below.
 
 \func{}{wxFilterInputStream}{\param{wxInputStream\&}{ stream}}
 
-Initializes a "filter" stream. A filter stream has the capability of a normal
+Initializes a "filter" stream.
-stream but it can be placed on the top of another stream. So, for example, it
-can uncompress, uncrypt the datas which are read from another stream and pass it
-to the requester.
 

docs/latex/wx/fltoutst.tex

@@ -3,6 +3,11 @@
 % -----------------------------------------------------------------------------
 \section{\class{wxFilterOutputStream}}\label{wxfilteroutputstream}
 
+A filter stream has the capability of a normal
+stream but it can be placed on top of another stream. So, for example, it
+can compress, encrypt the data which are passed to it and write them to another
+stream.
+
 \wxheading{Derived from}
 
 \helpref{wxOutputStream}{wxoutputstream}\\
@@ -24,8 +29,5 @@ differs and it is documented below.
 
 \func{}{wxFilterOutputStream}{\param{wxOutputStream\&}{ stream}}
 
-Initializes a "filter" stream. A filter stream has the capability of a normal
+Initializes a "filter" stream.
-stream but it can be placed on the top of another stream. So, for example, it
-can compress, crypt the datas which are passed to it and write them to another
-stream.
 

docs/latex/wx/fsfile.tex

@@ -5,8 +5,8 @@
 
 \section{\class{wxFSFile}}\label{wxfsfile}
 
-This class represents single file opened by \helpref{wxFileSystem}{wxfilesystem}.
+This class represents a single file opened by \helpref{wxFileSystem}{wxfilesystem}.
-It provides more information than wx's input stream 
+It provides more information than wxWindow's input stream 
 (stream, filename, mime type, anchor).
 
 {\bf Note:} Any pointer returned by wxFSFile's member is valid

docs/latex/wx/hthelpct.tex

@@ -19,7 +19,8 @@ wxHTML uses Microsoft's HTML Help Workshop project files (.hhp, .hhk, .hhc) as i
 native format. The file format is described \helpref{here}{helpformat}.
 Have a look at docs/html/ directory where sample project files are stored.
 
-You can use tex2rtf to generate MHHW projects (see wxHTML homepage for details).
+You can use Tex2RTF to produce these files when generating HTML, if you set {\bf htmlWorkshopFiles} to {\bf true} in
+your tex2rtf.ini file.
 
 In order to use the controller in your application under Windows you must
 have the following line in your .rc file:

docs/latex/wx/htmlhlpf.tex

@@ -1,6 +1,8 @@
 \membersection{Help Files Format}\label{helpformat}
 
 wxHTML library uses a reduced version of MS HTML Workshop format.
+Tex2RTF can produce these files when generating HTML, if you set {\bf htmlWorkshopFiles} to {\bf true} in
+your tex2rtf.ini file.
 
 (See \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller} for help controller description.)
 
@@ -17,15 +19,15 @@ Title=@title of your book@
 Default topic=@default page to be displayed.htm@
 \end{verbatim}
 
-All filenames (including Default topic) are relative to the location of .hhp file.
+All filenames (including the Default topic) are relative to the location of .hhp file.
 
-For larger projects I recommend storing everything but .hhp file into one .zip archive. (E.g. contents file 
+For larger projects I recommend storing everything but .hhp file into one .zip archive. (The contents file 
-would then be reffered as myhelp.zip\#zip:contents.hhc)
+would then be referred to as myhelp.zip\#zip:contents.hhc)
 
 \wxheading{Contents file (.hhc)}
 
 Contents file has HTML syntax and it can be parsed by regular HTML parser. It contains exactly one list
-(<ul>....</ul> statement):
+(\verb$<ul>$....\verb$</ul>$ statement):
 
 \begin{verbatim}
 <ul>
@@ -49,7 +51,7 @@ You can modify value attributes of param tags. {\it topic name} is name of chapt
 contents, {\it filename.htm} is HTML page name (relative to .hhp file) and {\it numeric_id} is optional 
 - it is used only when you use \helpref{wxHtmlHelpController::Display(int)}{wxhtmlhelpcontrollerdisplay}
 
-Items in the list may be nested - one \<li\> statement may contain \<ul\> sub-statement:
+Items in the list may be nested - one \verb$<li>$ statement may contain a \verb$<ul>$ sub-statement:
 
 \begin{verbatim}
 <ul>

docs/latex/wx/htmlstrt.tex

@@ -64,5 +64,5 @@ borders (space between border of window and displayed HTML). Related functions:
 \end{itemize}
 
 The last two functions are used to store user customization info wxConfig stuff
-(for example registry under Windows or dotfile under Unix).
+(for example in the registry under Windows, or in a dotfile under Unix).
 

docs/latex/wx/strmbfrd.tex

@@ -3,6 +3,10 @@
 % -----------------------------------------------------------------------------
 \section{\class{wxBufferedInputStream}}\label{wxbufferedinputstream}
 
+This stream acts as a cache. It caches the bytes read from the specified
+input stream (See \helpref{wxFilterInputStream}{wxfilterinputstream}).
+It uses wxStreamBuffer and sets the default in-buffer size to 1024 bytes.
+
 \wxheading{Derived from}
 
 \helpref{wxFilterInputStream}{wxfilterinputstream}
@@ -15,17 +19,16 @@
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxInputStream}{wxinputstream}
 
-\wxheading{Short description}
-
-This stream acts as a cache. It caches the bytes read from the specified
-input stream (See \helpref{wxFilterInputStream}{wxfilterinputstream}).
-It uses wxStreamBuffer and sets the default in-buffer size to 1024 bytes.
-
 % -----------------------------------------------------------------------------
 % wxBufferedOutputStream
 % -----------------------------------------------------------------------------
 \section{\class{wxBufferedOutputStream}}\label{wxbufferedoutputstream}
 
+This stream acts as a cache. It caches the bytes to be written to the specified
+output stream (See \helpref{wxFilterOutputStream}{wxfilteroutputstream}). The
+datas are only written when the cache is full or when the buffered stream is
+destroyed.
+
 \wxheading{Derived from}
 
 \helpref{wxFilterOutputStream}{wxfilteroutputstream}
@@ -38,10 +41,3 @@ It uses wxStreamBuffer and sets the default in-buffer size to 1024 bytes.
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxOutputStream}{wxoutputstream}
 
-\wxheading{Short description}
-
-This stream acts as a cache. It caches the bytes to be written to the specified
-output stream (See \helpref{wxFilterOutputStream}{wxfilteroutputstream}). The
-datas are only written when the cache is full or when the buffered stream is
-destroyed.
-

docs/latex/wx/strmfile.tex

@@ -3,7 +3,7 @@
 % -----------------------------------------------------------------------------
 \section{\class{wxFileInputStream}}\label{wxfileinputstream}
 
-This classes represent data streams to and from a file. There are actually
+This class represents data read in from a file. There are actually
 two such groups of classes: those documented here, and another group called
 wxFFileInputStream, wxFFileOutputStream and wxFFileStream which are not
 based on file descriptors (and their wxWindows equivalent wxFile) but the
@@ -20,7 +20,7 @@ instead if "int fd") their interface is identical.
 
 \wxheading{See also}
 
-\helpref{wxStreamBuffer}{wxstreamBuffer}
+\helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxFileOutputStream}{wxfileoutputstream}
 
 % ----------
 % Members
@@ -58,6 +58,13 @@ Returns TRUE if the stream is initialized and ready.
 % -----------------------------------------------------------------------------
 \section{\class{wxFileOutputStream}}\label{wxfileoutputstream}
 
+This class represents data written to a file. There are actually
+two such groups of classes: those documented here, and another group called
+wxFFileInputStream, wxFFileOutputStream and wxFFileStream which are not
+based on file descriptors (and their wxWindows equivalent wxFile) but the
+FILE* type (and wxFFile). Apart from the different constructor ("FILE *file"
+instead if "int fd") their interface is identical.
+
 \wxheading{Derived from}
 
 \helpref{wxOutputStream}{wxoutputstream}
@@ -68,7 +75,7 @@ Returns TRUE if the stream is initialized and ready.
 
 \wxheading{See also}
 
-\helpref{wxStreamBuffer}{wxstreamBuffer}
+\helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxFileInputStream}{wxfileinputstream}
 
 % ----------
 % Members

docs/latex/wx/strmzlib.tex

@@ -3,6 +3,9 @@
 % -----------------------------------------------------------------------------
 \section{\class{wxZlibInputStream}}\label{wxzlibinputstream}
 
+This stream uncompresses all data read from it. It uses the "filtered"
+stream to get new compressed data.
+
 \wxheading{Derived from}
 
 \helpref{wxFilterInputStream}{wxfilterinputstream}
@@ -15,16 +18,14 @@
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxInputStream}{wxinputstream}
 
-\wxheading{Short description}
-
-This stream uncompresses all data read from it. It uses the "filtered"
-stream to get new compressed data.
-
 % -----------------------------------------------------------------------------
 % wxZlibOutputStream
 % -----------------------------------------------------------------------------
 \section{\class{wxZlibOutputStream}}\label{wxzliboutputstream}
 
+This stream compresses all data written to it, and passes the compressed data
+to the ``filtered'' stream.
+
 \wxheading{Derived from}
 
 \helpref{wxFilterOutputStream}{wxfilteroutputstream}
@@ -37,8 +38,3 @@ stream to get new compressed data.
 
 \helpref{wxStreamBuffer}{wxstreamBuffer}, \helpref{wxOutputStream}{wxoutputstream}
 
-\wxheading{Short description}
-
-This stream compresses all data written to it, and passes the compressed data
-to the ``filtered'' stream.
-

docs/msw/install.txt

@@ -65,7 +65,7 @@ Visual C++ 4.0/5.0/6.0 compilation
 
 Using project files:
 
-1. Unarchive wx200vc.zip, the VC++ 5 project makefiles.
+1. Unarchive wx200vc.zip, the VC++ 5/6 project makefiles.
 2. Open src/wxvc.dsp, set Debug or Release configuration, and
    compile. This will produce src/Debug/wxvc.lib or
    src/Release/wxvc.lib.  The project file src/wxvc_dll.dsp

src/common/imagall.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagpnm.cpp
+// Name:        imagall.cpp
 // Purpose:     wxImage access all handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$

src/msw/app.cpp

@@ -648,6 +648,13 @@ int wxEntry(WXHINSTANCE hInstance,
         // but this call is provided for compatibility across platforms.
         wxTheApp->OnInitGui();
 
+        // We really don't want timestamps by default, because it means
+        // we can't simply double-click on the error message and get to that
+        // line in the source. So VC++ at least, let's have a sensible default.
+#ifdef __VISUALC__
+        wxLog::SetTimestamp(NULL);
+#endif
+
         int retValue = 0;
 
         if ( wxTheApp->OnInit() )

src/wxvc.dsp

@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="wxvc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
@@ -22,9 +22,11 @@ CFG=wxvc - Win32 Debug
 !MESSAGE 
 
 # Begin Project
+# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
+RSC=rc.exe
 
 !IF  "$(CFG)" == "wxvc - Win32 Release"
 
@@ -40,12 +42,14 @@ CPP=cl.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"Release\wxvc.lib"
 
 !ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
 
@@ -61,12 +65,14 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE RSC /l 0x809
+# ADD RSC /l 0x809
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"Debug\wxvc.lib"
 
 !ENDIF 
 
@@ -127,11 +133,11 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\dobjcmn.cpp
+SOURCE=.\common\dlgcmn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\dlgcmn.cpp
+SOURCE=.\common\dobjcmn.cpp
 # End Source File
 # Begin Source File
 
@@ -199,6 +205,7 @@ SOURCE=.\common\fs_inet.cpp
 # Begin Source File
 
 SOURCE=.\common\fs_zip.cpp
+# ADD CPP /I "zlib"
 # End Source File
 # Begin Source File
 
@@ -226,6 +233,10 @@ SOURCE=.\common\http.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\imagall.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\imagbmp.cpp
 # End Source File
 # Begin Source File
@@ -456,6 +467,15 @@ SOURCE=.\common\zipstrm.cpp
 # Begin Source File
 
 SOURCE=.\common\zstream.cpp
+
+!IF  "$(CFG)" == "wxvc - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc - Win32 Debug"
+
+# SUBTRACT CPP /X
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Generic Files"

src/wxvc.dsw

@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
+Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

src/wxvc6.dsw

@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "wxvc6"=.\wxvc6.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

src/wxvc_dll.dsp

@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="wxvc_dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
@@ -17,12 +17,12 @@ CFG=wxvc_dll - Win32 Debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "wxvc_dll - Win32 Release" (based on\
+!MESSAGE "wxvc_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
- "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "wxvc_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
+# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -44,8 +44,8 @@ RSC=rc.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O1 /Ob2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXMAKINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -69,9 +69,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXMAKINGDLL=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXMAKINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -140,11 +140,11 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\dobjcmn.cpp
+SOURCE=.\common\dlgcmn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\dlgcmn.cpp
+SOURCE=.\common\dobjcmn.cpp
 # End Source File
 # Begin Source File
 
@@ -212,6 +212,7 @@ SOURCE=.\common\fs_inet.cpp
 # Begin Source File
 
 SOURCE=.\common\fs_zip.cpp
+# ADD CPP /I "zlib"
 # End Source File
 # Begin Source File
 
@@ -239,6 +240,10 @@ SOURCE=.\common\http.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\imagall.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\imagbmp.cpp
 # End Source File
 # Begin Source File
@@ -251,6 +256,11 @@ SOURCE=.\common\imaggif.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\imagjpeg.cpp
+# ADD CPP /I "../src/jpeg"
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\imagpng.cpp
 # ADD CPP /I "png" /I "zlib"
 # End Source File
@@ -599,10 +609,6 @@ SOURCE=.\html\htmprint.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\html\winpars.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\html\m_fonts.cpp
 # End Source File
 # Begin Source File
@@ -635,6 +641,11 @@ SOURCE=.\html\m_tables.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\html\winpars.cpp
+# End Source File
+# End Group
+# Begin Group "MSW Files"
+
 # PROP Default_Filter ""
 # Begin Source File
 
@@ -754,7 +765,7 @@ SOURCE=.\msw\dragimag.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dummydll.cpp
+SOURCE=.\msw\dummy.cpp
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
 # Begin Source File
@@ -873,7 +884,15 @@ SOURCE=.\msw\penwin.cpp
 # Begin Source File
 
 SOURCE=.\msw\pnghand.cpp
+
+!IF  "$(CFG)" == "wxvc_dll - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
+
 # ADD CPP /I "png" /I "zlib"
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
@@ -1002,6 +1021,7 @@ SOURCE=.\msw\window.cpp
 # Begin Source File
 
 SOURCE=.\msw\xpmhand.cpp
+# ADD CPP /I "../src/xpm"
 # End Source File
 # End Group
 # Begin Group "OLE Files"
@@ -1350,5 +1370,747 @@ SOURCE=.\zlib\zutil.c
 SOURCE=..\include\wx\msw\setup.h
 # End Source File
 # End Group
+
+# Begin Group "JPEG Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\jpeg\jcapimin.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcapistd.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jccoefct.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jccolor.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcdctmgr.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jchuff.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcinit.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcmainct.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcmarker.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcmaster.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcomapi.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcparam.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcphuff.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcprepct.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jcsample.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jctrans.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdapimin.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdapistd.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdatadst.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdatasrc.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdcoefct.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdcolor.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jddctmgr.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdhuff.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdinput.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdmainct.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdmarker.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdmaster.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdmerge.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdphuff.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdpostct.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdsample.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jdtrans.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jerror.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jfdctflt.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jfdctfst.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jfdctint.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jidctflt.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jidctfst.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jidctint.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jidctred.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jmemmgr.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jmemnobs.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jquant1.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jquant2.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpeg\jutils.c
+
+!IF  "$(CFG)" == "jpeg - Win32 Release"
+
+# ADD CPP /I ".."
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "jpeg - Win32 Debug"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# End Group
+
 # End Target
 # End Project

src/wxvc_dll.dsw

@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
+Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

utils/ogl/samples/studio/studio.cpp

@@ -492,10 +492,10 @@ bool csApp::WriteOptions()
 {
     wxConfig config("OGL Studio", "wxWindows");
 
-    config.Write("mainX", m_mainFramePos.x);
+    config.Write("mainX", (long) m_mainFramePos.x);
-    config.Write("mainY", m_mainFramePos.y);
+    config.Write("mainY", (long) m_mainFramePos.y);
-    config.Write("mainWidth", m_mainFrameSize.x);
+    config.Write("mainWidth", (long) m_mainFrameSize.x);
-    config.Write("mainHeight", m_mainFrameSize.y);
+    config.Write("mainHeight", (long) m_mainFrameSize.y);
     config.Write("gridStyle", (long) m_gridStyle);
     config.Write("gridSpacing", (long) m_gridSpacing);
 

utils/projgen/makeproj.cpp

@@ -54,7 +54,7 @@ public:
     virtual bool OnInit();
 
     bool GenerateSample(const wxString& projectName, const wxString& targetName,
-        const wxString& path, const wxStringList& sourceFiles);
+        const wxString& path, const wxStringList& sourceFiles, const wxString& relativeRootPath = "../..");
     void GenerateSamples(const wxString& dir); // Takes wxWindows directory path
 };
 
@@ -71,7 +71,7 @@ public:
     void OnGenerate(wxCommandEvent& event);
 
     bool GenerateSample(const wxString& projectName, const wxString& targetName,
-        const wxString& path, const wxStringList& sourceFiles);
+        const wxString& path, const wxStringList& sourceFiles, const wxString& relativeRootPath = "../..");
 
 private:
     // any class wishing to process wxWindows events must use this macro
@@ -162,16 +162,23 @@ bool MyApp::OnInit()
 }
 
 bool MyApp::GenerateSample(const wxString& projectName, const wxString& targetName,
-    const wxString& path, const wxStringList& sourceFiles)
+    const wxString& path, const wxStringList& sourceFiles, const wxString& relativeRootPath)
 {
+    wxString relativeIncludePath(relativeRootPath + wxString("/include"));
+    wxString relativeLibPath(relativeRootPath + wxString("/lib"));
+    wxString relativeDebugPath(relativeRootPath + wxString("/src/Debug"));
+    wxString relativeReleasePath(relativeRootPath + wxString("/src/Release"));
+    wxString relativeDebugPathJPEG(relativeRootPath + wxString("/src/jpeg/Debug"));
+    wxString relativeReleasePathJPEG(relativeRootPath + wxString("/src/jpeg/Release"));
+
     wxProject project;
 
     // For all samples
-    project.SetIncludeDirs(wxStringList("../../include", 0));
+    project.SetIncludeDirs(wxStringList((const char*) relativeIncludePath, 0));
-    project.SetResourceIncludeDirs(wxStringList("../../include", 0));
+    project.SetResourceIncludeDirs(wxStringList((const char*) relativeIncludePath, 0));
-    project.SetLibDirs(wxStringList("../../lib", 0));
+    project.SetLibDirs(wxStringList((const char*) relativeLibPath, 0));
-    project.SetDebugLibDirs(wxStringList("../../src/Debug", 0));
+    project.SetDebugLibDirs(wxStringList((const char*) relativeDebugPath, (const char*) relativeDebugPathJPEG, 0));
-    project.SetReleaseLibDirs(wxStringList("../../src/Release", 0));
+    project.SetReleaseLibDirs(wxStringList((const char*) relativeReleasePath, (const char*) relativeReleasePathJPEG, 0));
 
     project.SetProjectName(projectName);
     project.SetTargetName(targetName);
@@ -220,14 +227,22 @@ void MyApp::GenerateSamples(const wxString& dir)
     GenerateSample("HelpVC", "demo", dir + wxString("/samples/help"), wxStringList("demo.cpp", 0));
 
     // wxHTML samples
-    GenerateSample("AboutVC", "about", dir + wxString("/samples/html/about"), wxStringList("about.cpp", 0));
+    GenerateSample("AboutVC", "about", dir + wxString("/samples/html/about"), wxStringList("about.cpp", 0),
-    GenerateSample("HelpVC", "help", dir + wxString("/samples/html/help"), wxStringList("help.cpp", 0));
+        "../../..");
-    GenerateSample("PrintingVC", "printing", dir + wxString("/samples/html/printing"), wxStringList("printing.cpp", 0));
+    GenerateSample("HelpVC", "help", dir + wxString("/samples/html/help"), wxStringList("help.cpp", 0),
-    GenerateSample("TestVC", "test", dir + wxString("/samples/html/test"), wxStringList("test.cpp", 0));
+        "../../..");
-    GenerateSample("VirtualVC", "virtual", dir + wxString("/samples/html/virtual"), wxStringList("virtual.cpp", 0));
+    GenerateSample("PrintingVC", "printing", dir + wxString("/samples/html/printing"), wxStringList("printing.cpp", 0),
-    GenerateSample("WidgetVC", "widget", dir + wxString("/samples/html/widget"), wxStringList("widget.cpp", 0));
+        "../../..");
-    GenerateSample("ZipVC", "zip", dir + wxString("/samples/html/zip"), wxStringList("zip.cpp", 0));
+    GenerateSample("TestVC", "test", dir + wxString("/samples/html/test"), wxStringList("test.cpp", 0),
-    GenerateSample("HelpViewVC", "helpview", dir + wxString("/samples/html/helpview"), wxStringList("helpview.cpp", 0));
+        "../../..");
+    GenerateSample("VirtualVC", "virtual", dir + wxString("/samples/html/virtual"), wxStringList("virtual.cpp", 0),
+        "../../..");
+    GenerateSample("WidgetVC", "widget", dir + wxString("/samples/html/widget"), wxStringList("widget.cpp", 0),
+        "../../..");
+    GenerateSample("ZipVC", "zip", dir + wxString("/samples/html/zip"), wxStringList("zip.cpp", 0),
+        "../../..");
+    GenerateSample("HelpViewVC", "helpview", dir + wxString("/samples/html/helpview"), wxStringList("helpview.cpp", 0),
+        "../../..");
 
     GenerateSample("ImageVC", "image", dir + wxString("/samples/image"), wxStringList("image.cpp", 0));
     GenerateSample("InternatVC", "internat", dir + wxString("/samples/internat"), wxStringList("internat.cpp", 0));
@@ -320,7 +335,7 @@ void MyApp::GenerateSamples(const wxString& dir)
         wxMessageBox(msg);
     }
 
-    // Tex2RTF
+    // HelpGen
     project.SetIncludeDirs(wxStringList("../../../include", 0));
     project.SetResourceIncludeDirs(wxStringList("../../../include", 0));
     project.SetLibDirs(wxStringList("../../../lib", 0));
@@ -342,6 +357,24 @@ void MyApp::GenerateSamples(const wxString& dir)
         wxMessageBox(msg);
     }
 
+    // ProjGen
+    project.SetIncludeDirs(wxStringList("../../include", 0));
+    project.SetResourceIncludeDirs(wxStringList("../../include", 0));
+    project.SetLibDirs(wxStringList("../../lib", 0));
+    project.SetDebugLibDirs(wxStringList("../../src/Debug", 0));
+    project.SetReleaseLibDirs(wxStringList("../../src/Release", 0));
+
+    project.SetProjectName("ProjGenVC");
+    project.SetTargetName("makeproj");
+    project.SetProjectPath(dir + wxString("/utils/projgen"));
+    project.SetSourceFiles(wxStringList("makeproj.cpp", "makeproj.h", 0));
+
+    if (!project.GenerateVCProject())
+    {
+        wxString msg("Could not generate ProjGen project");
+        wxMessageBox(msg);
+    }
+
     // wxTreeLayout sample
 
     project.SetIncludeDirs(wxStringList("../../../include", 0));
@@ -525,9 +558,9 @@ void MyFrame::OnGenerate(wxCommandEvent& WXUNUSED(event))
 }
 
 bool MyFrame::GenerateSample(const wxString& projectName, const wxString& targetName,
-    const wxString& path, const wxStringList& sourceFiles)
+    const wxString& path, const wxStringList& sourceFiles, const wxString& relativeRootPath)
 {
-    return wxGetApp().GenerateSample(projectName, targetName, path, sourceFiles);
+    return wxGetApp().GenerateSample(projectName, targetName, path, sourceFiles, relativeRootPath);
 }
 
 /*
@@ -622,7 +655,7 @@ bool wxProject::GenerateVCProject()
     stream << "# ADD BSC32 /nologo\n";
     stream << "LINK32=link.exe\n";
     stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386\n";
-    stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wxvc.lib ";
+    stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wxvc.lib jpeg.lib ";
     n = m_extraLibs.Number();
     for (i = 0; i < n; i++)
     {
@@ -630,7 +663,7 @@ bool wxProject::GenerateVCProject()
         stream << lib << " ";
     }
 
-    stream << "/nologo /subsystem:windows /machine:I386 /nodefaultlib:\"libc.lib\" /nodefaultlib:\"libci.lib\" /out:\"Release/" << m_targetName << ".exe\"";
+    stream << "/nologo /subsystem:windows /machine:I386 /nodefaultlib:\"libc.lib,libci.lib,msvcrtd.lib\" /out:\"Release/" << m_targetName << ".exe\"";
 
     n = m_releaseLibDirs.Number();
     for (i = 0; i < n; i++)
@@ -682,7 +715,7 @@ bool wxProject::GenerateVCProject()
     stream << "# ADD BSC32 /nologo\n";
     stream << "LINK32=link.exe\n";
     stream << "# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\n";
-    stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wxvc.lib ";
+    stream << "# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wxvc.lib jpeg.lib ";
     n = m_extraLibs.Number();
     for (i = 0; i < n; i++)
     {

utils/projgen/makeproj.ncb

@@ -1 +0,0 @@
-Microsoft C/C++ program database 2.00

utils/projgen/makeproj.opt

@@ -1 +0,0 @@
-<EFBFBD><EFBFBD>ࡱ

utils/projgen/makeproj.pdb

@@ -1 +0,0 @@
-Microsoft C/C++ program database 2.00