diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex index b360e83a06..e707f43d96 100644 --- a/docs/latex/wx/window.tex +++ b/docs/latex/wx/window.tex @@ -546,6 +546,14 @@ wxTextCtrl under wxGTK) but is not implemented on all platforms nor for all controls so it is mostly just a hint to wxWindows and not a mandatory directive. +\membersection{wxWindow::GetAcceleratorTable}\label{wxwindowgetacceleratortable} + +\constfunc{wxAcceleratorTable*}{GetAcceleratorTable}{\void} + +Gets the accelerator table for this window. See \helpref{wxAcceleratorTable}{wxacceleratortable}. + +\membersection{wxWindow::GetAccessible}\label{wxwindowgetaccessible} + \membersection{wxWindow::GetAdjustedBestSize}\label{wxwindowgetadjustedbestsize} \constfunc{wxSize}{GetAdjustedBestSize}{\void} @@ -661,6 +669,16 @@ Returns a pointer to the window's layout constraints, or NULL if there are none. Return the sizer that this window is a member of, if any, otherwise {\tt NULL}. +\membersection{wxWindow::GetCursor}\label{wxwindowgetcursor} + +\constfunc{const wxCursor\&}{GetCursor}{\void} + +Return the cursor associated with this window. + +\wxheading{See also} + +\helpref{wxWindow::SetCursor}{wxwindowsetcursor} + \membersection{wxWindow::GetDropTarget}\label{wxwindowgetdroptarget} \constfunc{wxDropTarget*}{GetDropTarget}{\void} @@ -1065,7 +1083,7 @@ only redrawing those areas, which have been exposed. \pythonnote{In place of a single overloaded method name, wxPython implements the following methods:\par \indented{2cm}{\begin{twocollist} -\twocolitem{{\bf IsExposed(x,y, w=0,h=0}}{} +\twocolitem{{\bf IsExposed(x,y, w=0,h=0)}}{} \twocolitem{{\bf IsExposedPoint(pt)}}{} \twocolitem{{\bf IsExposedRect(rect)}}{} \end{twocollist}}} @@ -1136,8 +1154,7 @@ or frame). \func{virtual void}{MakeModal}{\param{bool }{flag}} Disables all other windows in the application so that -the user can only interact with this window. (This function -is not implemented anywhere). +the user can only interact with this window. \wxheading{Parameters} @@ -1775,7 +1792,7 @@ or frame). \func{virtual void}{Refresh}{\param{bool}{ eraseBackground = {\tt TRUE}}, \param{const wxRect* }{rect = NULL}} -Causes a message or event to be generated to repaint the +Causes an event to be generated to repaint the window. \wxheading{Parameters} diff --git a/docs/latex/wx/wxstring.tex b/docs/latex/wx/wxstring.tex index 632a1a8a22..b0cf516b85 100644 --- a/docs/latex/wx/wxstring.tex +++ b/docs/latex/wx/wxstring.tex @@ -615,6 +615,16 @@ This static function returns the string containing the result of calling Returns the number of occurrences of {\it ch} in the string. +\membersection{wxString::FromAscii}\label{wxstringfromascii} + +\func{static wxString }{FromAscii}{\param{const char*}{ s}} + +\func{static wxString }{FromAscii}{\param{const char}{ c}} + +Converts the string or character from an ASCII, 7-bit form +to the native wxString representation. Most useful when using +a Unicode build of wxWindows. + \membersection{wxString::GetChar}\label{wxstringgetchar} \constfunc{char}{GetChar}{\param{size\_t}{ n}} @@ -904,6 +914,17 @@ have different meaning). Returns the part of the string between the indices {\it from} and {\it to} inclusive. +\membersection{wxString::ToAscii}\label{wxstringtoascii} + +\constfunc{const char*}{ToAscii}{\void} + +Converts the string to an ASCII, 7-bit string (ANSI builds only). + +\constfunc{const wxCharBuffer}{ToAscii}{\void} + +Converts the string to an ASCII, 7-bit string in the form of +a wxCharBuffer (Unicode builds only). + \membersection{wxString::ToDouble}\label{wxstringtodouble} \constfunc{bool}{ToDouble}{\param{double}{ *val}} diff --git a/docs/msw/install.txt b/docs/msw/install.txt index cd390c0d98..22ea5d36ee 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -43,8 +43,7 @@ The setup program contains the following: - JPEG library source; - TIFF library source; - Object Graphics Library; -- Tex2RTF source; -- Dialog Editor binary. +- Tex2RTF source and binary. Alternatively, you may unarchive the .zip form by hand: wxMSW-x.y.z.zip where x.y.z is the version number. @@ -248,13 +247,13 @@ Compiling using the makefiles (updated 24 Sept 02): 2. Change directory to src\msw. Type 'make -f makefile.b32' to make the wxWindows core library. Ignore the compiler warnings. This produces a library in the wxwindows\lib directory called - wx32ds.lib + wx32ds_bcc.lib 3. Change directory to a sample or demo such as samples\minimal, and type 'make -f makefile.b32'. This produces a windows exe file 4. For release versions, recompile wxWindows and samples using 'make -f makefile.b32 clean' 'make -f makefile.b32 FINAL=1' - for the library and samples. This produces a library wx32s.lib eliminating + for the library and samples. This produces a library wx32s_bcc.lib eliminating all debugging information - if you wish to retain reduced debugging information 'make -f makefile.b32 clean' 'make -f makefile.b32 FINAL=hybrid' @@ -298,7 +297,7 @@ Note (0): This provides the ability to produce separate wxwindows libraries for different purposes, and only have to rebuild the applications -Note (1): In Borland 4.5 and earleir, using bcc.exe you also need to define BCCDIR +Note (1): In Borland 4.5 and earlier, using bcc.exe you also need to define BCCDIR in the autoexec.bat file; like this: set BCCDIR=c:\progra~1\borland\bcc so that it points to the root directory of @@ -728,40 +727,6 @@ Some functionality is missing using this compiler (see makefile). Add -D__WIN95__ if your SC++ has Windows 95 support, and ignore Step (2). 16-bit compilation is left as an exercise for the user! -Salford C++ compilation ------------------------ - -1. Make sure your WXWIN variable is set, and uses the FAT (short - name) form. -2. Edit SALFORDDIR and RESOURCEDIR in src/makesl.env as per - notes. -3. Change directory to wx\src\msw. Type 'mk32 -f makefile.sl all' to - make the wxWindows core library. -4. Change directory to wx\samples\minimal and type 'mk32 -f makefile.sl' - to make this sample. - -Unfortunately, Salford C++ seems to have problems with its code generation for -operations on objects, as seen in wxFrame::OnMenuHighlight -(minimal sample) or wxWindow::SetValidator (mdi sample). Also the -the debugging version of the library is 90MB, with samples coming in -at 40MB :-) However, wxWindows at least makes a good test suite for -improving the compiler. - -TWIN32 and gcc on Linux ------------------------ - -The wxWindows 2 for Windows port may be compiled using -the TWIN32 emulator package from www.willows.com. However, -TWIN32 is by no means finished so this should be taken as -something to think about for the future, rather than -a tool for writing products with. - -Use makefile.twn in much the same way as makefile.g95, as -described above. Not all sample makefiles are supplied yet. - -For some reason, I found I had to copy TWIN32's Windows resource -compiler (rc) to the current working directory for it to be found. - General Notes -------------