From 9c824f2977a2e8a502b0570c5301caa2a547833a Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 17 Mar 2000 09:19:37 +0000 Subject: [PATCH] Doc updates; new grid disabled for BC++/WIN16 (too much global data) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/generic.rsp | 1 + docs/latex/wx/classes.tex | 1 + docs/latex/wx/stopwtch.tex | 46 ++++++++++++++++++++++++++++++++++++++ docs/latex/wx/timer.tex | 46 -------------------------------------- docs/latex/wx/window.tex | 30 ++++++++++++------------- docs/msw/install.txt | 6 +++-- include/wx/msw/setup0.h | 5 +++++ src/common/timercmn.cpp | 2 +- src/jpeg/jmorecfg.h | 2 ++ src/makewat.env | 2 +- 10 files changed, 76 insertions(+), 65 deletions(-) create mode 100644 docs/latex/wx/stopwtch.tex diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 56836e991b..4c95514570 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -875,6 +875,7 @@ samples/wizard/*.png samples/wizard/*.ico samples/wizard/*.txt +samples/console/testdata.fc samples/console/*.cpp samples/console/*.h samples/console/makefile* diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex index 72e42a34ea..ab53709cac 100644 --- a/docs/latex/wx/classes.tex +++ b/docs/latex/wx/classes.tex @@ -241,6 +241,7 @@ \input statline.tex \input stattext.tex \input statusbr.tex +\input stopwtch.tex \input strmbase.tex \input stream.tex \input wxstring.tex diff --git a/docs/latex/wx/stopwtch.tex b/docs/latex/wx/stopwtch.tex new file mode 100644 index 0000000000..98b60ed19f --- /dev/null +++ b/docs/latex/wx/stopwtch.tex @@ -0,0 +1,46 @@ +\section{\class{wxStopWatch}}\label{wxstopwatch} + +The wxStopWatch class allow you to measure time intervalls. + +\wxheading{Include files} + + + +\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/timer.tex b/docs/latex/wx/timer.tex index f3f885d6cf..00eba9a6ca 100644 --- a/docs/latex/wx/timer.tex +++ b/docs/latex/wx/timer.tex @@ -159,49 +159,3 @@ void MyFrame::OnTimer(wxTimerEvent& event) Returns the interval of the timer which generated this event. -\section{\class{wxStopWatch}}\label{wxstopwatch} - -The wxStopWatch class allow you to measure time intervalls. - -\wxheading{Include files} - - - -\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/window.tex b/docs/latex/wx/window.tex index 73f5674491..8a062e2dbd 100644 --- a/docs/latex/wx/window.tex +++ b/docs/latex/wx/window.tex @@ -619,6 +619,21 @@ Each window has an integer identifier. If the application has not provided one \helpref{wxWindow::SetId}{wxwindowsetid}\rtfsp \helpref{Window identifiers}{windowids} +\membersection{wxWindow::GetLabel} + +\constfunc{virtual wxString }{GetLabel}{\void} + +Generic way of getting a label from any window, for +identification purposes. + +\wxheading{Remarks} + +The interpretation of this function differs from class to class. +For frames and dialogs, the value returned is the title. For buttons or static text controls, it is +the button text. This function can be useful for meta-programs (such as testing +tools or special-needs access programs) which need to identify windows +by name. + \membersection{wxWindow::GetPosition} \constfunc{virtual void}{GetPosition}{\param{int* }{x}, \param{int* }{y}} @@ -640,21 +655,6 @@ implements the following methods:\par \end{twocollist}} } -\membersection{wxWindow::GetLabel} - -\constfunc{virtual wxString }{GetLabel}{\void} - -Generic way of getting a label from any window, for -identification purposes. - -\wxheading{Remarks} - -The interpretation of this function differs from class to class. -For frames and dialogs, the value returned is the title. For buttons or static text controls, it is -the button text. This function can be useful for meta-programs (such as testing -tools or special-needs access programs) which need to identify windows -by name. - \membersection{wxWindow::GetName}\label{wxwindowgetname} \constfunc{virtual wxString }{GetName}{\void} diff --git a/docs/msw/install.txt b/docs/msw/install.txt index c3e6df76c8..608bd1276a 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -244,8 +244,10 @@ Note (5): BC++ 4.5 (not 5.0) trips up over jdmerge.c in the JPEG folder; you will therefore need to set wxUSE_LIBJPEG to 0 in setup.h and remove the jpeg target from src\msw\makefile.b32. -Note (6): If using C++Builder 4 and above (BC++ 5.4), change LINK=tlink32 to -LINK=ilink32 in src\makeb32.env. +Note (6): If using C++Builder 4 and above (BC++ 5.4 and above), change LINK=tlink32 to +LINK=ilink32 in src\makeb32.env. You may also need to disable +wxUSE_LIBJPEG because there is a conflict in the BC++ headers +(actually this problem seems to have gone away with 5.5 and SP1). Compiling using the IDE files: diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index a51d94437c..ddf9fa048c 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -173,6 +173,8 @@ // Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using // wxGrid and 100% backwards compatible (with all old wxGrid quirks) is // essential. +// +// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit. #define wxUSE_GRID 1 #define wxUSE_NEW_GRID 1 @@ -575,6 +577,9 @@ #undef wxUSE_ODBC #define wxUSE_ODBC 0 + +#undef wxUSE_NEW_GRID +#define wxUSE_NEW_GRID 0 #endif #if defined(__WXMSW__) && defined(__WATCOMC__) diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp index f6148e0aa9..67cec8530c 100644 --- a/src/common/timercmn.cpp +++ b/src/common/timercmn.cpp @@ -295,7 +295,7 @@ wxLongLong wxGetLocalTimeMillis() ::GetLocalTime(&st); val += st.wMilliseconds; #else -#ifndef __VISUALC__ +#if !defined(__VISUALC__) && !defined(__BORLANDC__) #warning "wxStopWatch will be up to second resolution!" #endif #endif diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h index fc34aab470..5e9510042d 100644 --- a/src/jpeg/jmorecfg.h +++ b/src/jpeg/jmorecfg.h @@ -238,8 +238,10 @@ typedef unsigned int JDIMENSION; #ifdef NEED_FAR_POINTERS #define FAR far #else +#ifndef FAR #define FAR #endif +#endif /* diff --git a/src/makewat.env b/src/makewat.env index 8a1b302fd7..11c5031607 100644 --- a/src/makewat.env +++ b/src/makewat.env @@ -55,7 +55,7 @@ LIBS = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR) $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib & $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib & $(WATLIBDIR)\uuid.lib $(WXDIR)\lib\watcom\odbc32.lib -IFLAGS = -i=$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\nt;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\include\wx\msw\gnuwin32 +IFLAGS = -i=$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\nt;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff;$(WXDIR)\include\wx\msw\gnuwin32 RESFLAGS1 = -r -bt=nt /i$(WXDIR)\include /i$(WXDIR)\contrib\include RESFLAGS2 = -R $(name) /i$(WXDIR)\include /i$(WXDIR)\contrib\include -- 2.45.2