From ba7fe276d4606f96352a468dbad872aa48932d8c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 17 Dec 2002 22:22:19 +0000 Subject: [PATCH] Doc corrections filelist.txt correction and filedlgg.cpp inclusion for wxUniv/MSW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/filelist.txt | 6 +-- distrib/msw/zipdistinno.bat | 2 + docs/latex/wx/filesys.tex | 30 +++++------ src/wxUniv.dsp | 99 ++++++++++++++++++---------------- 4 files changed, 72 insertions(+), 65 deletions(-) diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index b326acaf71..d34f3e0f8d 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -80,7 +80,7 @@ dirctrlg.cpp Generic dirdlgg.cpp Generic NotWin32 dragimgg.cpp Generic NotOS2 fdrepdlg.cpp Generic NotMSW -filedlgg.cpp Generic NotMSW,NotX,NotOS2,NotMac +filedlgg.cpp Generic Generic,NotX,NotOS2,NotMac fontdlgg.cpp Generic Generic,NotOS2 grid.cpp Generic gridctrl.cpp Generic @@ -297,7 +297,7 @@ evtloop.cpp MSW LowLevel fdrepdlg.cpp MSW Win32Only # FIXME: the generic implementation doesn't work under MSW, so we must # the native dialog under MSW -filedlg.cpp MSW LowLevel +filedlg.cpp MSW font.cpp MSW LowLevel fontdlg.cpp MSW fontenum.cpp MSW LowLevel @@ -309,7 +309,7 @@ gdiimage.cpp MSW LowLevel gdiobj.cpp MSW LowLevel glcanvas.cpp MSW helpchm.cpp MSW Win32Only,LowLevel -helpwin.cpp MSW LowLevel +helpwin.cpp MSW LowLevel icon.cpp MSW LowLevel imaglist.cpp MSW Win32Only iniconf.cpp MSW diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat index ef2d096c8f..ba67aac004 100755 --- a/distrib/msw/zipdistinno.bat +++ b/distrib/msw/zipdistinno.bat @@ -119,6 +119,8 @@ zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp +zip32 -@ %dest%\wxWindows-%version%-CW-Mac.zip < %src%\distrib\msw\cw_mac.rsp + erase /Y %src%\include\wx\setup.h if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version% diff --git a/docs/latex/wx/filesys.tex b/docs/latex/wx/filesys.tex index 6cb94ad996..10a5c6e082 100644 --- a/docs/latex/wx/filesys.tex +++ b/docs/latex/wx/filesys.tex @@ -59,28 +59,28 @@ Sets the current location. {\it location} parameter passed to \helpref{OpenFile}{wxfilesystemopenfile} is relative to this path. {\bf Caution! } Unless {\it is\_dir} is TRUE the {\it location} parameter -is not directory name but the name of the file in this directory!! All these -commands change path to "dir/subdir/" : +is not the directory name but the name of the file in this directory. All these +commands change the path to "dir/subdir/": \begin{verbatim} -ChangePathTo("dir/subdir/xh.htm"); -ChangePathTo("dir/subdir", TRUE); -ChangePathTo("dir/subdir/", TRUE); + ChangePathTo("dir/subdir/xh.htm"); + ChangePathTo("dir/subdir", TRUE); +C hangePathTo("dir/subdir/", TRUE); \end{verbatim} \wxheading{Parameters} -\docparam{location}{the new location. Its meaning depends on value of {\it is\_dir}} +\docparam{location}{the new location. Its meaning depends on the value of {\it is\_dir}} -\docparam{is\_dir}{if TRUE {\it location} is new directory. If FALSE (default) +\docparam{is\_dir}{if TRUE {\it location} is new directory. If FALSE (default) {\it location} is {\bf file in} the new directory.} \wxheading{Example} \begin{verbatim} -f = fs -> OpenFile("hello.htm"); // opens file 'hello.htm' -fs -> ChangePathTo("subdir/folder", TRUE); -f = fs -> OpenFile("hello.htm"); // opens file 'subdir/folder/hello.htm' !! + f = fs -> OpenFile("hello.htm"); // opens file 'hello.htm' + fs -> ChangePathTo("subdir/folder", TRUE); + f = fs -> OpenFile("hello.htm"); // opens file 'subdir/folder/hello.htm' !! \end{verbatim} \membersection{wxFileSystem::GetPath}\label{wxfilesystemgetpath} @@ -112,14 +112,13 @@ wxFILE (only files), wxDIR (only directories) or 0 (both). \func{wxString}{FindNext}{\void} -Returns next filename that matches parameters passed to \helpref{FindFirst}{wxfilesystemfindfirst}. - +Returns the next filename that matches parameters passed to \helpref{FindFirst}{wxfilesystemfindfirst}. \membersection{wxFileSystem::OpenFile}\label{wxfilesystemopenfile} \func{wxFSFile*}{OpenFile}{\param{const wxString\& }{location}} -Opens file and returns pointer to \helpref{wxFSFile}{wxfsfile} object +Opens the file and returns a pointer to a \helpref{wxFSFile}{wxfsfile} object or NULL if failed. It first tries to open the file in relative scope (based on value passed to ChangePathTo() method) and then as an absolute path. @@ -128,10 +127,11 @@ absolute path. \func{static wxFileName}{URLToFileName}{\param{const wxString& }{url}} -Converts URL into well-formed filename. The URL must use {\tt file} +Converts URL into a well-formed filename. The URL must use the {\tt file} protocol. \wxheading{See also} -\helpref{wxFileSystem::FileNameToURL}{wxfilesystemfilenametourl}, +\helpref{wxFileSystem::FileNameToURL}{wxfilesystemfilenametourl}, \helpref{wxFileName}{wxfilename} + diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index 721188c706..ed45e84392 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"..\lib\wxuniv.lib" !ELSEIF "$(CFG)" == "wxUniv - Win32 Debug" @@ -221,11 +221,6 @@ SOURCE=.\common\event.cpp # End Source File # Begin Source File -SOURCE=.\common\extended.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\common\fddlgcmn.cpp # End Source File # Begin Source File @@ -554,11 +549,6 @@ SOURCE=.\common\txtstrm.cpp # End Source File # Begin Source File -SOURCE=.\common\unzip.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\common\url.cpp # End Source File # Begin Source File @@ -609,6 +599,18 @@ SOURCE=.\common\zipstrm.cpp SOURCE=.\common\zstream.cpp # End Source File + +# Begin Source File + +SOURCE=.\common\extended.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\common\unzip.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File + # End Group # Begin Group "Generic Files" @@ -659,6 +661,10 @@ SOURCE=.\generic\fdrepdlg.cpp # End Source File # Begin Source File +SOURCE=.\generic\filedlgg.cpp +# End Source File +# Begin Source File + SOURCE=.\generic\fontdlgg.cpp # End Source File # Begin Source File @@ -789,6 +795,7 @@ SOURCE=.\generic\treelay.cpp SOURCE=.\generic\wizard.cpp # End Source File + # End Group # Begin Group "wxHTML Files" @@ -873,12 +880,18 @@ SOURCE=.\html\m_tables.cpp SOURCE=.\html\winpars.cpp # End Source File + # End Group # Begin Group "MSW Files" # PROP Default_Filter "" # Begin Source File +SOURCE=.\msw\dummy.cpp +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + SOURCE=.\msw\app.cpp # End Source File # Begin Source File @@ -943,19 +956,10 @@ SOURCE=.\msw\dir.cpp # End Source File # Begin Source File -SOURCE=.\msw\dummy.cpp -# ADD CPP /Yc"wx/wxprec.h" -# End Source File -# Begin Source File - SOURCE=.\msw\evtloop.cpp # End Source File # Begin Source File -SOURCE=.\msw\filedlg.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\font.cpp # End Source File # Begin Source File @@ -976,16 +980,6 @@ SOURCE=.\msw\gdiobj.cpp # End Source File # Begin Source File -SOURCE=.\msw\gsocket.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\msw\helpbest.cpp # End Source File # Begin Source File @@ -1068,26 +1062,22 @@ SOURCE=.\msw\volume.cpp SOURCE=.\msw\window.cpp # End Source File -# End Group -# Begin Group "Universal Files" - -# PROP Default_Filter "" -# Begin Group "Theme Files" -# PROP Default_Filter "" # Begin Source File -SOURCE=.\univ\themes\gtk.cpp +SOURCE=.\msw\gsocket.c +# SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=.\univ\themes\metal.cpp +SOURCE=.\msw\gsockmsw.c +# SUBTRACT CPP /YX /Yc /Yu # End Source File -# Begin Source File -SOURCE=.\univ\themes\win32.cpp -# End Source File # End Group +# Begin Group "Universal Files" + +# PROP Default_Filter "" # Begin Source File SOURCE=.\univ\bmpbuttn.cpp @@ -1224,6 +1214,24 @@ SOURCE=.\univ\topluniv.cpp SOURCE=.\univ\winuniv.cpp # End Source File + +# Begin Group "Theme Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\univ\themes\gtk.cpp +# End Source File +# Begin Source File + +SOURCE=.\univ\themes\metal.cpp +# End Source File +# Begin Source File + +SOURCE=.\univ\themes\win32.cpp +# End Source File + +# End Group # End Group # Begin Group "Headers" @@ -1234,9 +1242,7 @@ SOURCE=.\univ\winuniv.cpp # Begin Source File SOURCE=..\include\wx\univ\setup.h - !IF "$(CFG)" == "wxUniv - Win32 Release" - # Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath) InputPath=..\include\wx\univ\setup.h @@ -1244,9 +1250,7 @@ InputPath=..\include\wx\univ\setup.h copy "$(InputPath)" ..\lib\univ\wx\setup.h # End Custom Build - !ELSEIF "$(CFG)" == "wxUniv - Win32 Debug" - # Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath) InputPath=..\include\wx\univ\setup.h @@ -1254,9 +1258,7 @@ InputPath=..\include\wx\univ\setup.h copy "$(InputPath)" ..\lib\univd\wx\setup.h # End Custom Build - !ENDIF - # End Source File # End Group # Begin Group "Common" @@ -2210,6 +2212,7 @@ SOURCE=..\include\wx\zipstrm.h SOURCE=..\include\wx\zstream.h # End Source File + # End Group # Begin Group "MSW" @@ -2378,6 +2381,7 @@ SOURCE=..\include\wx\generic\treectlg.h SOURCE=..\include\wx\generic\wizard.h # End Source File + # End Group # Begin Group "HTML" @@ -2434,6 +2438,7 @@ SOURCE=..\include\wx\html\m_templ.h SOURCE=..\include\wx\html\winpars.h # End Source File + # End Group # Begin Group "Universal" -- 2.45.2