Documented wxStopWatch and wxToolBar::AddControl().

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

diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index f50059eae2705749f67d1e4602a37fd37b223116..01d1c801321742af4e127d534f6b0ed6f4fb8a56 100644 (file)
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,6 +1,30 @@
 
 20th November '99: wxWindows 2.1.12 released
 
 
 20th November '99: wxWindows 2.1.12 released
 

+Who has a BigEndian computer (e.g. Sparc) that runs a 15 and/or
+16 bit colour mode. I need this for testing purposes, i.e. this
+person could help me by running a small testprogram and sending
+me the output.
+
+Added wxStopWatch class.
+
+wxBitmap now derives from wxGDIObject.
+
+Added inlined classes for 2D geometry calculations.
+
+wxSpinCtrl now has its own event, intercepted using EVT_SPINCTRL.
+
+The ODBC classes can now be configured at run-time if they
+are to use forward-only cursors or not.
+
+Added wxDateTime class.
+
+Rewritten wxThread to have a flag controlling if the
+thread will delete its C++ class itself ("delete this") or
+if the main thread must delete the C++ class.
+
+Added TIFF reading code.
+

 Minor compile and build fixes for different architectures.
 
 Added more flags to wxSizer for proportional sizing and
 Minor compile and build fixes for different architectures.
 
 Added more flags to wxSizer for proportional sizing and


@@ -24,6 +48,11 @@ Some minor updates to wxSockets.
 
 Speed-up for new encoding related font code.
 
 
 Speed-up for new encoding related font code.
 

+Change wxListCtrl to send deferred events, i.e. events emitted by
+the list ctrl won't get processed before the next idle message.
+
+Some more minor changes.
+

 7st November '99: wxWindows 2.1.11 released
 
 There is still an unresolved problem with bitmap to image
 7st November '99: wxWindows 2.1.11 released
 
 There is still an unresolved problem with bitmap to image

diff --git a/docs/latex/wx/category.tex b/docs/latex/wx/category.tex
index 806ffb90b724aec6b163dd7bfdc7d76413f0936b..be71c5c4a4cdc51c7163eadda8ad78b733640d95 100644 (file)
--- a/docs/latex/wx/category.tex
+++ b/docs/latex/wx/category.tex
@@ -417,6 +417,7 @@ libraries, and to provide enhanced functionality.
 \twocolitem{\helpref{wxLayoutAlgorithm}{wxlayoutalgorithm}}{An alternative window layout facility}
 \twocolitem{\helpref{wxProcess}{wxprocess}}{Process class}
 \twocolitem{\helpref{wxTimer}{wxtimer}}{Timer class}
 \twocolitem{\helpref{wxLayoutAlgorithm}{wxlayoutalgorithm}}{An alternative window layout facility}
 \twocolitem{\helpref{wxProcess}{wxprocess}}{Process class}
 \twocolitem{\helpref{wxTimer}{wxtimer}}{Timer class}

+\twocolitem{\helpref{wxStopWatch}{wxstopwatch}}{Stop watch class}

 \twocolitem{\helpref{wxSystemSettings}{wxsystemsettings}}{System settings class}
 \end{twocollist}
 
 \twocolitem{\helpref{wxSystemSettings}{wxsystemsettings}}{System settings class}
 \end{twocollist}
 

diff --git a/docs/latex/wx/timer.tex b/docs/latex/wx/timer.tex
index a3d297137c6198de04ebb697468ff89dcafb9859..4560342c9d2cf7ca6581aa6178979d663f4a0427 100644 (file)
--- a/docs/latex/wx/timer.tex
+++ b/docs/latex/wx/timer.tex
@@ -15,7 +15,7 @@ Stop}, it's as simple as that.
 
 \wxheading{See also}
 
 
 \wxheading{See also}
 

-\helpref{::wxStartTimer}{wxstarttimer}, \helpref{::wxGetElapsedTime}{wxgetelapsedtime}
+\helpref{::wxStartTimer}{wxstarttimer}, \helpref{::wxGetElapsedTime}{wxgetelapsedtime}, \helpref{wxStopWatch}{wxstopwatch}

 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 


@@ -60,4 +60,48 @@ called. If TRUE, Notify will be called only once.
 
 Stops the timer.
 
 
 Stops the timer.
 

+\section{\class{wxStopWatch}}\label{wxstopwatch}

 
 

+The wxStopWatch class allow you to measure time intervalls. 
+
+\wxheading{Include files}
+
+<wx/timer.h>
+
+\wxheading{See also}
+
+\helpref{::wxStartTimer}{wxstarttimer}, \helpref{::wxGetElapsedTime}{wxgetelapsedtime}, \helpref{wxTimer}{wxtimer}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxStopWatch::wxStopWatch}
+
+\func{}{wxStopWatch}{\void}
+
+Constructor. This starts the stop watch.
+
+\membersection{wxStopWatch::Pause}\label{wxstopwatchpause}
+
+\func{void}{Pause}{\void}
+
+Pauses the stop watch. Call \helpref{wxStopWatch::Resume}{wxstopwatchresume} to resume 
+time measuring again.
+
+\membersection{wxStopWatch::Start}
+
+\func{void}{Start}{\param{long}{ milliseconds = 0}}
+
+(Re)starts the stop watch with a given initial value.
+
+\membersection{wxStopWatch::Resume}\label{wxstopwatchresume}
+
+\func{void}{Resume}{\void}
+
+Resumes the stop watch after having been paused with \helpref{wxStopWatch::Pause}{wxstopwatchpause}.
+
+\membersection{wxStopWatch::Time}
+
+\func{long}{Time}{\void}\label{wxstopwatchtime}
+
+Returns the time in milliseconds since the start (or restart) or the last call of 
+\helpref{wxStopWatch::Pause}{wxstopwatchpause}.

diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index c348cf28c852117e7280f62fedba7f678fab06ac..1c4942264c17e8ea077df29f20e0dbb48c84037c 100644 (file)
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -11,7 +11,7 @@ Used on platforms with no native toolbar control, or where scrolling is required
 \end{itemize}
 
 Note that the base class {\bf wxToolBarBase} defines
 \end{itemize}
 
 Note that the base class {\bf wxToolBarBase} defines

-automatic scrolling management functionality which is identical
+automatic scrolling management functionality which is similar

 to \helpref{wxScrolledWindow}{wxscrolledwindow}, so please refer to this class also.
 Not all toolbars support scrolling, but wxToolBarSimple does.
 
 to \helpref{wxScrolledWindow}{wxscrolledwindow}, so please refer to this class also.
 Not all toolbars support scrolling, but wxToolBarSimple does.
 


@@ -36,10 +36,15 @@ wxToolBarBase\\
 You may also create a toolbar that is managed by the frame, by
 calling \helpref{wxFrame::CreateToolBar}{wxframecreatetoolbar}.
 
 You may also create a toolbar that is managed by the frame, by
 calling \helpref{wxFrame::CreateToolBar}{wxframecreatetoolbar}.
 

+Due to the use of native toolbars on the various platforms, certain adaptions will
+often have to be made in order to get optimal look on all platforms as some platforms
+ignore the values for explicit placement and use their own layout and the meaning
+of a "separator" is a vertical line under Windows95 vs. simple space under GTK etc.
+

 {\bf wxToolBar95:} Note that this toolbar paints tools to reflect user-selected colours.
 The toolbar orientation must always be {\bf wxHORIZONTAL}.
 
 {\bf wxToolBar95:} Note that this toolbar paints tools to reflect user-selected colours.
 The toolbar orientation must always be {\bf wxHORIZONTAL}.
 

-{\bf wxToolBarGtk:}  The toolbar orientation is ignored and is always {\bf wxHORIZONTAL}.
+{\bf wxToolBarGtk:} The toolbar orientation is ignored and is always {\bf wxHORIZONTAL}.

 
 \wxheading{Window styles}
 
 
 \wxheading{Window styles}
 


@@ -143,6 +148,14 @@ calling \helpref{wxFrame::CreateToolBar}{wxframecreatetoolbar}.
 
 Toolbar destructor.
 
 
 Toolbar destructor.
 

+\membersection{wxToolBar::AddControl}\label{wxtoolbaraddcontrol}
+
+\func{bool}{AddControl}{\param{wxControl*}{ control}}
+
+Adds any control to the toolbar, typically e.g. a combobox.
+
+\docparam{control}{The control to be added.}
+

 \membersection{wxToolBar::AddSeparator}\label{wxtoolbaraddseparator}
 
 \func{void}{AddSeparator}{\void}
 \membersection{wxToolBar::AddSeparator}\label{wxtoolbaraddseparator}
 
 \func{void}{AddSeparator}{\void}