From 576b18f2147ed92a0b8e0b7e360c5fe8ca0d3abd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 20 Oct 2007 14:45:46 +0000 Subject: [PATCH] spelling and other minor fixes (patch 1806283) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/dc.tex | 15 +++++++++++++-- docs/latex/wx/dragimag.tex | 2 +- docs/latex/wx/function.tex | 8 +++++--- docs/latex/wx/glcanvas.tex | 2 +- docs/latex/wx/image.tex | 15 ++++++++++++--- docs/latex/wx/listctrl.tex | 2 +- docs/latex/wx/panel.tex | 2 +- docs/latex/wx/sizer.tex | 2 +- docs/tech/tn0020.txt | 2 +- 9 files changed, 36 insertions(+), 14 deletions(-) diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex index cdae272859..fdc1c815be 100644 --- a/docs/latex/wx/dc.tex +++ b/docs/latex/wx/dc.tex @@ -633,6 +633,17 @@ rectangle are returned as a tuple.} {\tt ( x, y, width, height )}} +\membersection{wxDC::GetDepth}\label{wxdcgetdepth} + +\constfunc{int}{GetDepth}{\void} + +Returns the depth (number of bits/pixel) of this DC. + +\wxheading{See also} + +\helpref{wxDisplayDepth}{wxdisplaydepth} + + \membersection{wxDC::GetFont}\label{wxdcgetfont} \constfunc{const wxFont\&}{GetFont}{\void} @@ -1138,7 +1149,7 @@ The mapping mode can be one of the following: \twocolitem{wxMM\_POINTS}{Each logical unit is a point, or 1/72 of an inch.} \twocolitem{wxMM\_METRIC}{Each logical unit is 1 mm.} \twocolitem{wxMM\_LOMETRIC}{Each logical unit is 1/10 of a mm.} -\twocolitem{wxMM\_TEXT}{Each logical unit is 1 pixel.} +\twocolitem{wxMM\_TEXT}{Each logical unit is 1 device pixel.} \end{twocollist} @@ -1151,7 +1162,7 @@ or bitmap associated with the DC. If the argument is wxNullPalette, the current palette is selected out of the device context, and the original palette restored. -See \helpref{wxPalette}{wxpalette} for further details. +See \helpref{wxPalette}{wxpalette} for further details. \membersection{wxDC::SetPen}\label{wxdcsetpen} diff --git a/docs/latex/wx/dragimag.tex b/docs/latex/wx/dragimag.tex index c9d7d3375f..633e80e68e 100644 --- a/docs/latex/wx/dragimag.tex +++ b/docs/latex/wx/dragimag.tex @@ -3,7 +3,7 @@ This class is used when you wish to drag an object on the screen, and a simple cursor is not enough. -On Windows, the WIN32 API is used to do achieve smooth dragging. On other platforms, +On Windows, the Win32 API is used to achieve smooth dragging. On other platforms, wxGenericDragImage is used. Applications may also prefer to use wxGenericDragImage on Windows, too. diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex index 76ecbf4986..b3230a5d8e 100644 --- a/docs/latex/wx/function.tex +++ b/docs/latex/wx/function.tex @@ -1962,6 +1962,8 @@ See also \helpref{wxIsBusy}{wxisbusy}, \helpref{wxBusyCursor}{wxbusycursor}. Ring the system bell. +Note that this function is categorized as a GUI one and so is not thread-safe. + \wxheading{Include files} @@ -3370,7 +3372,7 @@ Returns the mouse position in screen coordinates. Returns the current state of the mouse. Returns a wxMouseState instance that contains the current position of the mouse pointer in -screen coordinants, as well as boolean values indicating the up/down +screen coordinates, as well as boolean values indicating the up/down status of the mouse buttons and the modifier keys. \wxheading{Include files} @@ -3425,8 +3427,8 @@ Returns label that should be used for given {\it id} element. \docparam{id}{given id of the \helpref{wxMenuItem}{wxmenuitem}, \helpref{wxButton}{wxbutton}, \helpref{wxToolBar}{wxtoolbar} tool, etc.} \docparam{withCodes}{if false then strip accelerator code from the label; -usefull for getting labels without accelerator char code like for toolbar tooltip or -under platforms without traditional keyboard like smartphones} +useful for getting labels without accelerator char code like for toolbar tooltip or +on platforms without traditional keyboard like smartphones} \docparam{accelerator}{optional accelerator string automatically added to label; useful for building labels for \helpref{wxMenuItem}{wxmenuitem}} diff --git a/docs/latex/wx/glcanvas.tex b/docs/latex/wx/glcanvas.tex index ba2a49e3cc..c6e293d7de 100644 --- a/docs/latex/wx/glcanvas.tex +++ b/docs/latex/wx/glcanvas.tex @@ -62,7 +62,7 @@ alpha channel, and accum buffer. Other implementations may support them. \twocolitem{\windowstyle{WX\_GL\_LEVEL}}{0 for main buffer, >0 for overlay, <0 for underlay} \twocolitem{\windowstyle{WX\_GL\_DOUBLEBUFFER}}{Use doublebuffer} \twocolitem{\windowstyle{WX\_GL\_STEREO}}{Use stereoscopic display} -\twocolitem{\windowstyle{WX\_GL\_AUX\_BUFFERS}}{Number of auxiliary buffers (not all implementation support this option)} +\twocolitem{\windowstyle{WX\_GL\_AUX\_BUFFERS}}{Number of auxiliary buffers (not all implementations support this option)} \twocolitem{\windowstyle{WX\_GL\_MIN\_RED}}{Use red buffer with most bits (> MIN\_RED bits)} \twocolitem{\windowstyle{WX\_GL\_MIN\_GREEN}}{Use green buffer with most bits (> MIN\_GREEN bits) } \twocolitem{\windowstyle{WX\_GL\_MIN\_BLUE}}{Use blue buffer with most bits (> MIN\_BLUE bits) } diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex index 56a42b74d9..8a7721ff5d 100644 --- a/docs/latex/wx/image.tex +++ b/docs/latex/wx/image.tex @@ -781,7 +781,8 @@ the user. \wxheading{See also} \helpref{wxImageHandler}{wximagehandler}, -\helpref{wxInitAllImageHandlers}{wxinitallimagehandlers} +\helpref{wxInitAllImageHandlers}{wxinitallimagehandlers}, +\helpref{wxQuantize}{wxquantize} \membersection{wxImage::InsertHandler}\label{wximageinserthandler} @@ -945,6 +946,12 @@ Returns a mirrored copy of the image. The parameter {\it horizontally} indicates the orientation. +\membersection{wxImage::Paste}\label{wximagepaste} + +\func{void}{Paste}{\param{const wxImage\& }{image}, \param{int }{x}, \param{int }{y}} + +Copy the data of the given \arg{image} to the specified position in this image. + \membersection{wxImage::Replace}\label{wximagereplace} \func{void}{Replace}{\param{unsigned char}{ r1}, \param{unsigned char}{ g1}, \param{unsigned char}{ b1}, @@ -1159,8 +1166,10 @@ Returns a resized version of this image without scaling it by adding either a bo with the given colour or cropping as necessary. The image is pasted into a new image with the given {\it size} and background colour at the position {\it pos} relative to the upper left of the new image. If {\it red = green = blue = -1} -then use either the current mask colour if set or find, use, and set a -suitable mask colour for any newly exposed areas. +then the areas of the larger image not covered by this image are made +transparent by filling them with the image mask colour (which will be allocated +automatically if it isn't currently set). Otherwise, the areas will be filled +with the colour with the specified RGB components. \wxheading{See also} diff --git a/docs/latex/wx/listctrl.tex b/docs/latex/wx/listctrl.tex index 4e1b969eb9..e92d627f7d 100644 --- a/docs/latex/wx/listctrl.tex +++ b/docs/latex/wx/listctrl.tex @@ -975,7 +975,7 @@ used. \membersection{wxListCtrl::SetItemColumnImage}\label{wxlistctrlsetitemcolumnimage} -\func{bool}{SetItemImage}{\param{long }{item}, \param{long }{column}\param{int }{image}} +\func{bool}{SetItemColumnImage}{\param{long }{item}, \param{long }{column}, \param{int }{image}} Sets the image associated with the item. In report view, you can specify the column. The image is an index into the image list associated with the list control. diff --git a/docs/latex/wx/panel.tex b/docs/latex/wx/panel.tex index 5883f63799..90b4ad50e1 100644 --- a/docs/latex/wx/panel.tex +++ b/docs/latex/wx/panel.tex @@ -160,7 +160,7 @@ one child window, the focus will be given to the child window. \func{virtual void}{SetFocusIgnoringChildren}{\void} In contrast to \helpref{wxPanel::SetFocus}{wxpanelsetfocus} (see above) -this will set the focus to the panel even of there are child windows +this will set the focus to the panel even if there are child windows in the panel. This is only rarely needed. \wxheading{See also} diff --git a/docs/latex/wx/sizer.tex b/docs/latex/wx/sizer.tex index ccf896b2aa..f4c4f94bc5 100644 --- a/docs/latex/wx/sizer.tex +++ b/docs/latex/wx/sizer.tex @@ -185,7 +185,7 @@ Adds stretchable space to the sizer. More readable way of calling \func{wxSize}{CalcMin}{\void} This method is abstract and has to be overwritten by any derived class. -Here, the sizer will do the actual calculation of its children minimal sizes. +Here, the sizer will do the actual calculation of its children's minimal sizes. \membersection{wxSizer::Clear}\label{wxsizerclear} diff --git a/docs/tech/tn0020.txt b/docs/tech/tn0020.txt index 8bcbf2c3a7..7abe7576f8 100644 --- a/docs/tech/tn0020.txt +++ b/docs/tech/tn0020.txt @@ -3,7 +3,7 @@ 0. Purpose ---------- -This is broad technote covering all aspects of binary compatibility with +This is a broad technote covering all aspects of binary compatibility with wxWidgets. 1. Releases -- 2.47.2