Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typo correction patch [ 1208110 ] Lots of typo corrections

Browse Source 
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-05-31 09:20:43 +00:00
parent a6905d8b55
commit 3103e8a97e
155 changed files with 279 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/docs/latex/mmedia/sndbase.tex
View File

@@ -30,8 +30,8 @@ No base class
\twocolwidtha{7cm}
\begin{twocollist}\itemsep=0pt
\twocolitem{{\bf wxSOUND\_NOERR}}{No error occured}
\twocolitem{{\bf wxSOUND\_IOERR}}{An input/output error occured, it may concern
\twocolitem{{\bf wxSOUND\_NOERR}}{No error occurred}
\twocolitem{{\bf wxSOUND\_IOERR}}{An input/output error occurred, it may concern
either a driver or a file}
\twocolitem{{\bf wxSOUND\_INVFRMT}}{The sound format passed to the function is
invalid. Generally, it means that you passed out of range values to the codec
@@ -271,7 +271,7 @@ Sets the event handler: if it is non-null, all events are routed to it.
\constfunc{wxSoundError}{GetError}{\void}
It returns the last error which occured.
It returns the last error which occurred.
\membersection{wxSoundStream::GetLastAccess}\label{wxsoundstreamgetlastaccess}
@@ -290,5 +290,5 @@ until the IO queue has at least one empty entry.
\func{void}{OnSoundEvent}{\param{int }{evt}}
It is called by the wxSoundStream when a new sound event occured.
It is called by the wxSoundStream when a new sound event occurred.

2
contrib/include/wx/fl/controlbar.h
View File

@@ -888,7 +888,7 @@ class cbBarInfo : public wxObject
{
DECLARE_DYNAMIC_CLASS( cbBarInfo )
public:
// textual name, by which this bar is refered in layout-customization dialogs
// textual name, by which this bar is referred in layout-customization dialogs
wxString mName;
// stores bar's bounds in pane's coordinates

2
contrib/include/wx/foldbar/captionbar.h
View File

@@ -24,7 +24,7 @@
#define wxFPB_EXTRA_X 10
#define wxFPB_EXTRA_Y 4
#define wxFPB_BMP_RIGHTSPACE 2 // pixels of the bmp to be alligned from the right filled with space
#define wxFPB_BMP_RIGHTSPACE 2 // pixels of the bmp to be aligned from the right filled with space
enum
{

16
contrib/include/wx/foldbar/foldpanelbar.h
View File

@@ -96,7 +96,7 @@ WX_DEFINE_ARRAY_PTR(wxFoldPanelItem *, wxFoldPanelItemArray);
This control is easy to use. Simply create it as a child for a panel or sash window, and populate panels with
wxFoldPanelBar::AddFoldPanel(). Then use the wxFoldPanelBar::AddFoldPanelWindow() to add wxWindow derived controls
to the current fold panel. Use wxFoldPanelBar::AddFoldPanelSeperator() to put separators between the groups of
to the current fold panel. Use wxFoldPanelBar::AddFoldPanelSeparator() to put separators between the groups of
controls that need a visual separator to group them together. After all is constructed, the user can fold
the panels by doubleclicking on the bar or single click on the arrow, which will indicate the collapsed or
expanded state.
@@ -125,12 +125,12 @@ private:
void RefreshPanelsFrom(wxFoldPanelItem *item);
/** Returns the length of the panels that are expanded and collapsed. This is useful to determine
quickly what size is used to display, and what is left at the bottom (right) to allign
quickly what size is used to display, and what is left at the bottom (right) to align
the collapsed panels. */
int GetPanelsLength(int &collapsed, int &expanded);
/** Reposition all the collapsed panels to the bottom. When it is not possible to
allign them to the bottom, stick them behind the visible panels. The Rect holds the
align them to the bottom, stick them behind the visible panels. The Rect holds the
slack area left between last repositioned panel and the bottom panels. This needs to
get a refresh */
wxRect RepositionCollapsedToBottom();
@@ -167,9 +167,9 @@ public:
/** Adds a wxWindow derived class to the referenced wxFoldPanel. IMPORTANT: Make the to be created window,
child of the wxFoldPanel. See example that follows. The flags to be used are:
- wxFPB_ALIGN_WIDTH: Which means the wxWindow to be added will be alligned to fit the width of the
- wxFPB_ALIGN_WIDTH: Which means the wxWindow to be added will be aligned to fit the width of the
wxFoldPanel when it is resized. Very handy for sizer items, buttons and text boxes.
- wxFPB_ALIGN_LEFT: Alligns left instead of fitting the width of the child window to be added. Use either
- wxFPB_ALIGN_LEFT: Aligns left instead of fitting the width of the child window to be added. Use either
this one or wxFPB_ALIGN_WIDTH.
The wxWindow to be added can be slightly indented from left and right so it is more visibly placed
@@ -196,7 +196,7 @@ public:
// color and also the indents and width alligning like a control.
m_pnl->AddFoldPanelSeperator(item);
// now add a text ctrl. Also very easy. Allign this on width so that when the control gets wider
// now add a text ctrl. Also very easy. Align this on width so that when the control gets wider
// the text control also sizes along.
m_pnl->AddFoldPanelWindow(item, new wxTextCtrl(item.GetParent(), wxID_ANY, wxT("Comment")), wxFPB_ALIGN_WIDTH, wxFPB_DEFAULT_SPACING, 20);
@@ -206,8 +206,8 @@ public:
int Spacing = wxFPB_DEFAULT_SPACING, int leftSpacing = wxFPB_DEFAULT_LEFTSPACING,
int rightSpacing = wxFPB_DEFAULT_RIGHTSPACING);
/** Adds a seperator line to the current wxFoldPanel. The seperator is a simple line which is drawn and is no
real component. It can be used to seperate groups of controls which belong to eachother. The colour is
/** Adds a separator line to the current wxFoldPanel. The separator is a simple line which is drawn and is no
real component. It can be used to separate groups of controls which belong to each other. The colour is
adjustable, and it takes the same ySpacing, leftSpacing and rightSpacing as AddFoldPanelWindow(). */
int AddFoldPanelSeperator(const wxFoldPanel &panel, const wxColour &color = wxColour(167,167,167),
int Spacing = wxFPB_DEFAULT_SPACING, int leftSpacing = wxFPB_DEFAULT_LEFTLINESPACING,

6
contrib/include/wx/foldbar/foldpanelitem.h
View File

@@ -121,13 +121,13 @@ public:
};
// resize the element, whatever it is. A separator or
// line will be always alligned by width or hight
// line will be always aligned by width or height
// depending on orientation of the whole panel
void ResizeItem(int size, bool vertical) {
if(m_flags & wxFPB_ALIGN_WIDTH)
{
// allign by taking full width
// align by taking full width
int mySize = size - m_leftSpacing - m_rightSpacing;
if(mySize < 0)
@@ -185,7 +185,7 @@ public:
virtual ~wxFoldPanelItem();
/** Add a window item to the list of items on this panel. The flags are wxFPB_ALIGN_LEFT for a non sizing
window element, and wxFPB_ALIGN_WIDTH for a width alligned item. The ySpacing parameter reserves a number
window element, and wxFPB_ALIGN_WIDTH for a width aligned item. The ySpacing parameter reserves a number
of pixels before the window element, and leftSpacing is an indent. rightSpacing is only relevant when the
style wxFPB_ALIGN_WIDTH is chosen. */
void AddWindow(wxWindow *window, int flags, int ySpacing, int leftSpacing, int rightSpacing);

6
contrib/include/wx/mmedia/sndbase.h
View File

@@ -45,8 +45,8 @@ typedef enum {
// ---------------------
// wxSoundError:
// - wxSOUND_NOERR: No error occured
// - wxSOUND_IOERR: an input/output error occured, it may concern either
// - wxSOUND_NOERR: No error occurred
// - wxSOUND_IOERR: an input/output error occurred, it may concern either
// a driver or a file
// - wxSOUND_INVFRMT: the sound format passed to the function is invalid.
// Generally, it means that you passed out of range values
@@ -83,7 +83,7 @@ class WXDLLIMPEXP_MMEDIA wxSoundStream;
// ---------------------
// wxSoundCallback(stream, evt, cdata): C callback for sound event.
// - stream: current wxSoundStream
// - evt: the sound event which has occured, it may be wxSOUND_INPUT,
// - evt: the sound event which has occurred, it may be wxSOUND_INPUT,
// wxSOUND_OUTPUT or wxSOUND_DUPLEX
// - cdata: User callback data
// ---------------------

2
contrib/src/fl/dyntbar.cpp
View File

@@ -426,7 +426,7 @@ void wxDynamicToolBar::SizeToolWindows()
info.mRect.height = mSepartorSize;
}
// Do we need to set a new size to a seperator object?
// Do we need to set a new size to a separator object?
if ( info.mpToolWnd )
{
info.mpToolWnd->SetSize( info.mRect.x,

2
contrib/src/foldbar/foldpanelbar.cpp
View File

@@ -352,7 +352,7 @@ int wxFoldPanelBar::GetPanelsLength(int &collapsed, int &expanded)
int value = 0;
// assumed here that all the panels that are expanded
// are positioned after eachother from 0,0 to end.
// are positioned after each other from 0,0 to end.
for(size_t j = 0; j < m_panels.GetCount(); j++)
{

2
contrib/src/mmedia/sndcpcm.cpp
View File

@@ -377,7 +377,7 @@ bool wxSoundStreamPcm::SetSoundFormat(const wxSoundFormatBase& format)
if (m_prebuffer)
delete[] m_prebuffer;
// We try to minimize the need of dynamic memory allocation by preallocating a buffer. But
// We try to minimize the need for dynamic memory allocation by preallocating a buffer. But
// to be sure it will be efficient we minimize the best size.
if (m_multiplier_in < m_multiplier_out) {
m_prebuffer_size = (wxUint32)(m_sndio->GetBestSize() *

2
contrib/src/mmedia/sndwin.cpp
View File

@@ -382,7 +382,7 @@ wxSoundInfoHeader *wxSoundStreamWin::AllocHeader(int mode)
// AllocHeaders() allocates WXSOUND_MAX_QUEUE (= 128) blocks for an operation
// queue. It uses AllocHeader() for each element.
//
// Once it has allocated all blocks, it returns true and if an error occured
// Once it has allocated all blocks, it returns true and if an error occurred
// it returns false.
// -------------------------------------------------------------------------
bool wxSoundStreamWin::AllocHeaders(int mode)

4
contrib/src/stc/scintilla/src/AutoComplete.h
View File

@@ -15,7 +15,7 @@ class AutoComplete {
char stopChars[256];
char fillUpChars[256];
char separator;
char typesep; // Type seperator
char typesep; // Type separator
public:
bool ignoreCase;
@@ -50,7 +50,7 @@ public:
void SetSeparator(char separator_);
char GetSeparator();
/// The typesep character is used for seperating the word from the type
/// The typesep character is used for separating the word from the type
void SetTypesep(char separator_);
char GetTypesep();

4
contrib/src/stc/scintilla/src/LexMetapost.cxx
View File

@@ -160,8 +160,8 @@ static void ColouriseMETAPOSTDoc(
int currentInterface = CheckMETAPOSTInterface(startPos,length,styler,defaultInterface) ;
// 0 no keyword highlighting
// 1 metapost keyword hightlighting
// 2+ metafun keyword hightlighting
// 1 metapost keyword highlighting
// 2+ metafun keyword highlighting
int extraInterface = 0 ;

6
contrib/utils/convertrc/rc2wxr.cpp
View File

@@ -399,7 +399,7 @@ wxFprintf(m_wxr,_T("[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],
bool rc2wxr::Seperator(int ch)
bool rc2wxr::Separator(int ch)
{
@@ -513,7 +513,7 @@ return tok;
while (Seperator(ch))
while (Separator(ch))
{
@@ -541,7 +541,7 @@ m_done=true;
while (!Seperator(ch))
while (!Separator(ch))
{

2
contrib/utils/convertrc/rc2wxr.h
View File

@@ -30,7 +30,7 @@ private:
void ParseStaticText();
void ParseTextCtrl();
void ParsePushButton();
bool Seperator(int ch);
bool Separator(int ch);
void ParseGroupBox();
void ReadRect(int & x, int & y, int & width, int & height);
wxString GetToken();

12
contrib/utils/convertrc/rc2xml.cpp
View File

@@ -342,7 +342,7 @@ void rc2xml::ParsePushButton(wxString phrase, wxString varname)
}
bool rc2xml::Seperator(int ch)
bool rc2xml::Separator(int ch)
{
//if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|')|(ch=='\t'))
if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='\t'))
@@ -387,7 +387,7 @@ bool rc2xml::ReadRect(int & x, int & y, int & width, int & height)
return ret; // check for more parameters
}
wxString rc2xml::GetToken(bool *listseperator)
wxString rc2xml::GetToken(bool *listseparator)
{
wxString token=wxEmptyString;
@@ -405,7 +405,7 @@ wxString rc2xml::GetToken(bool *listseperator)
return token;
}
while (Seperator(ch))
while (Separator(ch))
{
ReadChar(ch);
if (m_done)
@@ -418,7 +418,7 @@ wxString rc2xml::GetToken(bool *listseperator)
}
while (!Seperator(ch))
while (!Separator(ch))
{
token += (char)ch;
ReadChar(ch);
@@ -427,8 +427,8 @@ wxString rc2xml::GetToken(bool *listseperator)
if (ch == EOF)
m_done = true;
if (listseperator)
*listseperator = (ch == ',');
if (listseparator)
*listseparator = (ch == ',');
return token;
}

4
contrib/utils/convertrc/rc2xml.h
View File

@@ -62,10 +62,10 @@ protected:
void ParseRadioButton(wxString phrase,wxString varname);
void ParseCheckBox(wxString phrase,wxString varname);
void ParsePushButton(wxString phrase, wxString varname);
bool Seperator(int ch);
bool Separator(int ch);
void ParseGroupBox(wxString phrase, wxString varname);
bool ReadRect(int & x, int & y, int & width, int & height);
wxString GetToken(bool *listseperator = 0);
wxString GetToken(bool *listseparator = 0);
wxString GetQuoteField();
wxString GetStringQuote();
void ReadChar(int &ch);