Small mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -579,6 +579,8 @@ $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
|
|||||||
$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
|
$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
|
||||||
cd $(DOCDIR)\html\wx
|
cd $(DOCDIR)\html\wx
|
||||||
-hhc wx.hhp
|
-hhc wx.hhp
|
||||||
|
-mkdir ..\..\htmlhelp
|
||||||
|
move wx.chm ..\..\htmlhelp
|
||||||
cd $(THISDIR)
|
cd $(THISDIR)
|
||||||
|
|
||||||
$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
|
$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
|
||||||
|
@@ -5,7 +5,7 @@ set dest=%src\deliver
|
|||||||
set wise=0
|
set wise=0
|
||||||
|
|
||||||
Rem Set this to the required version
|
Rem Set this to the required version
|
||||||
set version=2_1_15
|
set version=2_1_16
|
||||||
|
|
||||||
if "%src" == "" goto usage
|
if "%src" == "" goto usage
|
||||||
if "%dest" == "" goto usage
|
if "%dest" == "" goto usage
|
||||||
@@ -53,6 +53,7 @@ zip32 -@ %dest\wx%version%_htm.zip < %src\distrib\msw\wx_html.rsp
|
|||||||
zip32 -@ %dest\wx%version%_pdf.zip < %src\distrib\msw\wx_pdf.rsp
|
zip32 -@ %dest\wx%version%_pdf.zip < %src\distrib\msw\wx_pdf.rsp
|
||||||
zip32 -@ %dest\wx%version%_wrd.zip < %src\distrib\msw\wx_word.rsp
|
zip32 -@ %dest\wx%version%_wrd.zip < %src\distrib\msw\wx_word.rsp
|
||||||
zip32 -@ %dest\wx%version%_htb.zip < %src\distrib\msw\wx_htb.rsp
|
zip32 -@ %dest\wx%version%_htb.zip < %src\distrib\msw\wx_htb.rsp
|
||||||
|
zip32 -@ %dest\wx%version%_chm.zip < %src\distrib\msw\wx_chm.rsp
|
||||||
|
|
||||||
Rem PDF/HTML docs that should go into the Windows setup because
|
Rem PDF/HTML docs that should go into the Windows setup because
|
||||||
Rem there are no WinHelp equivalents
|
Rem there are no WinHelp equivalents
|
||||||
|
@@ -291,7 +291,7 @@ objects. As explained in the overview, either wxTimeSpan or wxDateSpan may be
|
|||||||
added to wxDateTime, hence all functions are overloaded to accept both
|
added to wxDateTime, hence all functions are overloaded to accept both
|
||||||
arguments.
|
arguments.
|
||||||
|
|
||||||
Also, both {\tt Add()} and {\tt Substract()} have both const and non-const
|
Also, both {\tt Add()} and {\tt Subtract()} have both const and non-const
|
||||||
version. The first one returns a new obejct which represents the
|
version. The first one returns a new obejct which represents the
|
||||||
sum/difference of the original one with the argument while the second form
|
sum/difference of the original one with the argument while the second form
|
||||||
modifies the object to which it is applied. The operators $-=$ and $+=$ are
|
modifies the object to which it is applied. The operators $-=$ and $+=$ are
|
||||||
@@ -299,13 +299,13 @@ defined to be equivalent to the second forms of these functions.
|
|||||||
|
|
||||||
\helpref{Add(wxTimeSpan)}{wxdatetimeaddts}\\
|
\helpref{Add(wxTimeSpan)}{wxdatetimeaddts}\\
|
||||||
\helpref{Add(wxDateSpan)}{wxdatetimeaddds}\\
|
\helpref{Add(wxDateSpan)}{wxdatetimeaddds}\\
|
||||||
\helpref{Substract(wxTimeSpan)}{wxdatetimesubstractts}\\
|
\helpref{Subtract(wxTimeSpan)}{wxdatetimesubtractts}\\
|
||||||
\helpref{Substract(wxDateSpan)}{wxdatetimesubstractds}\\
|
\helpref{Subtract(wxDateSpan)}{wxdatetimesubtractds}\\
|
||||||
\helpref{Substract(wxDateTime)}{wxdatetimesubstractdt}\\
|
\helpref{Subtract(wxDateTime)}{wxdatetimesubtractdt}\\
|
||||||
\helpref{oparator$+=$(wxTimeSpan)}{wxdatetimeaddts}\\
|
\helpref{oparator$+=$(wxTimeSpan)}{wxdatetimeaddts}\\
|
||||||
\helpref{oparator$+=$(wxDateSpan)}{wxdatetimeaddds}\\
|
\helpref{oparator$+=$(wxDateSpan)}{wxdatetimeaddds}\\
|
||||||
\helpref{oparator$-=$(wxTimeSpan)}{wxdatetimesubstractts}\\
|
\helpref{oparator$-=$(wxTimeSpan)}{wxdatetimesubtractts}\\
|
||||||
\helpref{oparator$-=$(wxDateSpan)}{wxdatetimesubstractds}
|
\helpref{oparator$-=$(wxDateSpan)}{wxdatetimesubtractds}
|
||||||
|
|
||||||
\membersection{Parsing and formatting dates}
|
\membersection{Parsing and formatting dates}
|
||||||
|
|
||||||
@@ -916,15 +916,15 @@ this interval.
|
|||||||
|
|
||||||
Adds the given time span to this object.
|
Adds the given time span to this object.
|
||||||
|
|
||||||
\membersection{wxDateTime::Substract}\label{wxdatetimesubstract}
|
\membersection{wxDateTime::Subtract}\label{wxdatetimesubtract}
|
||||||
|
|
||||||
\constfunc{wxDateTime}{Substract}{\param{const wxTimeSpan\& }{diff}}
|
\constfunc{wxDateTime}{Subtract}{\param{const wxTimeSpan\& }{diff}}
|
||||||
|
|
||||||
\func{wxDateTime\&}{Substract}{\param{const wxTimeSpan\& }{diff}}
|
\func{wxDateTime\&}{Subtract}{\param{const wxTimeSpan\& }{diff}}
|
||||||
|
|
||||||
\func{wxDateTime\&}{operator$-=$}{\param{const wxTimeSpan\& }{diff}}
|
\func{wxDateTime\&}{operator$-=$}{\param{const wxTimeSpan\& }{diff}}
|
||||||
|
|
||||||
Substracts the given time span from this object.
|
Subtracts the given time span from this object.
|
||||||
|
|
||||||
\membersection{wxDateTime::Add}\label{wxdatetimeadd}
|
\membersection{wxDateTime::Add}\label{wxdatetimeadd}
|
||||||
|
|
||||||
@@ -936,21 +936,21 @@ Substracts the given time span from this object.
|
|||||||
|
|
||||||
Adds the given date span to this object.
|
Adds the given date span to this object.
|
||||||
|
|
||||||
\membersection{wxDateTime::Substract}\label{wxdatetimesubstract}
|
\membersection{wxDateTime::Subtract}\label{wxdatetimesubtract}
|
||||||
|
|
||||||
\constfunc{wxDateTime}{Substract}{\param{const wxDateSpan\& }{diff}}
|
\constfunc{wxDateTime}{Subtract}{\param{const wxDateSpan\& }{diff}}
|
||||||
|
|
||||||
\func{wxDateTime\&}{Substract}{\param{const wxDateSpan\& }{diff}}
|
\func{wxDateTime\&}{Subtract}{\param{const wxDateSpan\& }{diff}}
|
||||||
|
|
||||||
\func{wxDateTime\&}{operator$-=$}{\param{const wxDateSpan\& }{diff}}
|
\func{wxDateTime\&}{operator$-=$}{\param{const wxDateSpan\& }{diff}}
|
||||||
|
|
||||||
Substracts the given date span from this object.
|
Subtracts the given date span from this object.
|
||||||
|
|
||||||
\membersection{wxDateTime::Substract}\label{wxdatetimesubstract}
|
\membersection{wxDateTime::Subtract}\label{wxdatetimesubtract}
|
||||||
|
|
||||||
\constfunc{wxTimeSpan}{Substract}{\param{const wxDateTime\& }{dt}}
|
\constfunc{wxTimeSpan}{Subtract}{\param{const wxDateTime\& }{dt}}
|
||||||
|
|
||||||
Substracts another date from this one and returns the difference between them
|
Subtracts another date from this one and returns the difference between them
|
||||||
as wxTimeSpan.
|
as wxTimeSpan.
|
||||||
|
|
||||||
%%%%%%%%%%%%%%%%%%%%%%%%%%% parsing/formatting %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
%%%%%%%%%%%%%%%%%%%%%%%%%%% parsing/formatting %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||||
|
@@ -784,6 +784,8 @@ $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
|
|||||||
$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
|
$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
|
||||||
cd $(DOCDIR)\html\wx
|
cd $(DOCDIR)\html\wx
|
||||||
-hhc wx.hhp
|
-hhc wx.hhp
|
||||||
|
-mkdir ..\..\htmlhelp
|
||||||
|
move wx.chm ..\..\htmlhelp
|
||||||
cd $(THISDIR)
|
cd $(THISDIR)
|
||||||
|
|
||||||
$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
|
$(WXDIR)\docs\latex\wx\manual.dvi: $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
|
||||||
|
Reference in New Issue
Block a user