No code changes, fixed various typos.
Applied patch by snowleopard2 fixing typos in interface/. Extended the fixes throughout trunk. Closes #13076. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -641,7 +641,7 @@ protected:
|
||||
// main (ie. topmost) window of a composite control (default = this)
|
||||
wxWindow* m_mainCtrlWnd;
|
||||
|
||||
// used to prevent immediate re-popupping incase closed popup
|
||||
// used to prevent immediate re-popupping in case closed popup
|
||||
// by clicking on the combo control (needed because of inconsistent
|
||||
// transient implementation across platforms).
|
||||
wxLongLong m_timeCanAcceptClick;
|
||||
|
@@ -2307,7 +2307,7 @@ enum wxDeprecatedGUIConstants
|
||||
wxTRANSPARENT,
|
||||
|
||||
/* Brush & Pen Stippling. Note that a stippled pen cannot be dashed!! */
|
||||
/* Note also that stippling a Pen IS meaningfull, because a Line is */
|
||||
/* Note also that stippling a Pen IS meaningful, because a Line is */
|
||||
wxSTIPPLE_MASK_OPAQUE, /* mask is used for blitting monochrome using text fore and back ground colors */
|
||||
wxSTIPPLE_MASK, /* mask is used for masking areas in the stipple bitmap (TO DO) */
|
||||
/* drawn with a Pen, and without any Brush -- and it can be stippled. */
|
||||
|
@@ -171,7 +171,7 @@ public:
|
||||
bool IsConnectedEvent() const
|
||||
{ return GetEventType() == wxEVT_DIALUP_CONNECTED; }
|
||||
|
||||
// does this event come from wxDialUpManager::Dial() or from some extrenal
|
||||
// does this event come from wxDialUpManager::Dial() or from some external
|
||||
// process (i.e. does it result from our own attempt to establish the
|
||||
// connection)?
|
||||
bool IsOwnEvent() const { return m_id != 0; }
|
||||
|
@@ -636,7 +636,7 @@ private: \
|
||||
// that wants to export a wxArray daubed with your own import/export goo.
|
||||
//
|
||||
// Finally, you can define the macro below as something special to modify the
|
||||
// arrays defined by a simple WX_FOO_ARRAY as well. By default is is empty.
|
||||
// arrays defined by a simple WX_FOO_ARRAY as well. By default is empty.
|
||||
#define wxARRAY_DEFAULT_EXPORT
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -160,7 +160,7 @@ public:
|
||||
// is successful and after the next Layout the item will be resized.
|
||||
bool SetSpan( const wxGBSpan& span );
|
||||
|
||||
// Returns true if this item and the other item instersect
|
||||
// Returns true if this item and the other item intersect
|
||||
bool Intersects(const wxGBSizerItem& other);
|
||||
|
||||
// Returns true if the given pos/span would intersect with this item.
|
||||
|
@@ -49,7 +49,7 @@ public:
|
||||
|
||||
virtual wxControl *AsControl() { return this; }
|
||||
|
||||
public: // overrideable
|
||||
public: // overridable
|
||||
|
||||
virtual wxDialog *CreateDialog() = 0;
|
||||
|
||||
@@ -114,7 +114,7 @@ public:
|
||||
pos, size, style, validator, name);
|
||||
}
|
||||
|
||||
public: // overrideable
|
||||
public: // overridable
|
||||
|
||||
virtual long GetDialogStyle() const
|
||||
{
|
||||
@@ -190,7 +190,7 @@ public:
|
||||
pos, size, style, validator, name);
|
||||
}
|
||||
|
||||
public: // overrideable
|
||||
public: // overridable
|
||||
|
||||
virtual long GetDialogStyle() const
|
||||
{
|
||||
|
@@ -81,7 +81,7 @@ protected:
|
||||
virtual void InitColours();
|
||||
|
||||
// true if the status bar shows the size grip: for this it must have
|
||||
// wxSTB_SIZEGRIP style and the window it is attached to must be resizeable
|
||||
// wxSTB_SIZEGRIP style and the window it is attached to must be resizable
|
||||
// and not maximized
|
||||
bool ShowsSizeGrip() const;
|
||||
|
||||
|
@@ -534,8 +534,8 @@ public:
|
||||
inline wxSize GetSize()
|
||||
{ return wxSize((int) m_width, (int) m_height); }
|
||||
|
||||
// for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their
|
||||
// position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately
|
||||
// for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their
|
||||
// position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately
|
||||
|
||||
inline wxDouble GetLeft() const { return m_x; }
|
||||
inline void SetLeft( wxDouble n ) { m_width += m_x - n; m_x = n; }
|
||||
@@ -661,8 +661,8 @@ public:
|
||||
inline wxPoint2DInt GetPosition() { return wxPoint2DInt(m_x, m_y); }
|
||||
inline wxSize GetSize() { return wxSize(m_width, m_height); }
|
||||
|
||||
// for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their
|
||||
// position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately
|
||||
// for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their
|
||||
// position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately
|
||||
|
||||
inline wxInt32 GetLeft() const { return m_x; }
|
||||
inline void SetLeft( wxInt32 n ) { m_width += m_x - n; m_x = n; }
|
||||
|
@@ -49,7 +49,7 @@ enum
|
||||
WX_GL_MIN_ACCUM_BLUE, // use blue buffer with most bits (> MIN_ACCUM_BLUE bits)
|
||||
WX_GL_MIN_ACCUM_ALPHA, // use alpha buffer with most bits (> MIN_ACCUM_ALPHA bits)
|
||||
WX_GL_SAMPLE_BUFFERS, // 1 for multisampling support (antialiasing)
|
||||
WX_GL_SAMPLES // 4 for 2x2 antialising supersampling on most graphics cards
|
||||
WX_GL_SAMPLES // 4 for 2x2 antialiasing supersampling on most graphics cards
|
||||
};
|
||||
|
||||
#define wxGLCanvasName wxT("GLCanvas")
|
||||
|
@@ -46,7 +46,7 @@ public:
|
||||
virtual void SetSortOrder( bool ascending );
|
||||
virtual void SetAsSortKey(bool sort = true);
|
||||
|
||||
virtual void SetResizeable( bool resizeable );
|
||||
virtual void SetResizeable( bool resizable );
|
||||
virtual void SetHidden( bool hidden );
|
||||
|
||||
virtual void SetMinWidth( int minWidth );
|
||||
|
@@ -155,7 +155,7 @@ public:
|
||||
void GtkUpdateScrollbar(int orient);
|
||||
|
||||
// Called from GTK signal handlers. it indicates that
|
||||
// the layouting functions have to be called later on
|
||||
// the layout functions have to be called later on
|
||||
// (i.e. in idle time, implemented in OnInternalIdle() ).
|
||||
void GtkUpdateSize() { m_sizeSet = false; }
|
||||
|
||||
|
@@ -97,7 +97,7 @@ public:
|
||||
// unspecified/default
|
||||
virtual int GetWidth() const = 0;
|
||||
|
||||
// minimal width can be set for resizeable columns to forbid resizing them
|
||||
// minimal width can be set for resizable columns to forbid resizing them
|
||||
// below the specified size (set to 0 to remove)
|
||||
virtual int GetMinWidth() const = 0;
|
||||
|
||||
@@ -177,8 +177,8 @@ public:
|
||||
void ClearFlag(int flag);
|
||||
void ToggleFlag(int flag);
|
||||
|
||||
virtual void SetResizeable(bool resizeable)
|
||||
{ ChangeFlag(wxCOL_RESIZABLE, resizeable); }
|
||||
virtual void SetResizeable(bool resizable)
|
||||
{ ChangeFlag(wxCOL_RESIZABLE, resizable); }
|
||||
virtual void SetSortable(bool sortable)
|
||||
{ ChangeFlag(wxCOL_SORTABLE, sortable); }
|
||||
virtual void SetReorderable(bool reorderable)
|
||||
|
@@ -472,11 +472,11 @@ protected:
|
||||
// Each wxHtmlWindow has it's own parser because sharing one global
|
||||
// parser would be problematic (because of reentrancy)
|
||||
wxHtmlWinParser *m_Parser;
|
||||
// contains name of actualy opened page or empty string if no page opened
|
||||
// contains name of actually opened page or empty string if no page opened
|
||||
wxString m_OpenedPage;
|
||||
// contains name of current anchor within m_OpenedPage
|
||||
wxString m_OpenedAnchor;
|
||||
// contains title of actualy opened page or empty string if no <TITLE> tag
|
||||
// contains title of actually opened page or empty string if no <TITLE> tag
|
||||
wxString m_OpenedPageTitle;
|
||||
// class for opening files (file system)
|
||||
wxFileSystem* m_FS;
|
||||
|
@@ -389,7 +389,7 @@ public:
|
||||
|
||||
// operations
|
||||
// expand a string in the format of GetOpenCommand (which may contain
|
||||
// '%s' and '%t' format specificators for the file name and mime type
|
||||
// '%s' and '%t' format specifiers for the file name and mime type
|
||||
// and %{param} constructions).
|
||||
static wxString ExpandCommand(const wxString& command,
|
||||
const MessageParameters& params);
|
||||
|
@@ -16,7 +16,7 @@
|
||||
|
||||
// this option is always enabled (there doesn't seem to be any good reason to
|
||||
// disable it) for desktop Windows versions but Windows CE dialogs are usually
|
||||
// not resizeable and never show resize gripper anyhow so don't use it there
|
||||
// not resizable and never show resize gripper anyhow so don't use it there
|
||||
#ifdef __WXWINCE__
|
||||
#define wxUSE_DIALOG_SIZEGRIP 0
|
||||
#else
|
||||
@@ -114,7 +114,7 @@ protected:
|
||||
private:
|
||||
#if wxUSE_DIALOG_SIZEGRIP
|
||||
// these functions deal with the gripper window shown in the corner of
|
||||
// resizeable dialogs
|
||||
// resizable dialogs
|
||||
void CreateGripper();
|
||||
void DestroyGripper();
|
||||
void ShowGripper(bool show);
|
||||
|
@@ -1485,7 +1485,7 @@
|
||||
// Recommended setting: 1, required by wxMediaCtrl
|
||||
#define wxUSE_ACTIVEX 1
|
||||
|
||||
// wxDC cacheing implementation
|
||||
// wxDC caching implementation
|
||||
#define wxUSE_DC_CACHEING 1
|
||||
|
||||
// Set this to 1 to enable wxDIB class used internally for manipulating
|
||||
|
@@ -63,7 +63,7 @@
|
||||
// Recommended setting: 1, required by wxMediaCtrl
|
||||
#define wxUSE_ACTIVEX 1
|
||||
|
||||
// wxDC cacheing implementation
|
||||
// wxDC caching implementation
|
||||
#define wxUSE_DC_CACHEING 1
|
||||
|
||||
// Set this to 1 to enable wxDIB class used internally for manipulating
|
||||
|
@@ -60,7 +60,7 @@ public:
|
||||
virtual void SetMaxWidth (int maxWidth);
|
||||
virtual void SetMinWidth (int minWidth);
|
||||
virtual void SetReorderable(bool reorderable);
|
||||
virtual void SetResizeable (bool resizeable);
|
||||
virtual void SetResizeable (bool resizable);
|
||||
virtual void SetSortable (bool sortable);
|
||||
virtual void SetSortOrder (bool ascending);
|
||||
virtual void SetTitle (wxString const& title);
|
||||
|
@@ -273,7 +273,7 @@
|
||||
/*
|
||||
Preprocessor in older Borland compilers have major problems
|
||||
concatenating with ##. Specifically, if the string operands being
|
||||
concatenated have special meaning (e.g L"str", 123i64 etc)
|
||||
concatenated have special meaning (e.g. L"str", 123i64 etc)
|
||||
then ## will not concatenate the operands correctly.
|
||||
|
||||
As a workaround, define wxPREPEND* and wxAPPEND* without using
|
||||
|
@@ -889,7 +889,7 @@ public:
|
||||
/**
|
||||
Set proportion of a auto-stretchable column. wxPG_SPLITTER_AUTO_CENTER
|
||||
window style needs to be used to indicate that columns are auto-
|
||||
resizeable.
|
||||
resizable.
|
||||
|
||||
@returns Returns @false on failure.
|
||||
|
||||
|
@@ -139,7 +139,7 @@ protected:
|
||||
wxString GetPortCmdArgument(const wxIPV4address& Local, const wxIPV4address& New);
|
||||
|
||||
// accept connection from server in active mode, returns the same socket as
|
||||
// passed in in passive mode
|
||||
// passed in passive mode
|
||||
wxSocketBase *AcceptIfActive(wxSocketBase *sock);
|
||||
|
||||
|
||||
|
@@ -596,7 +596,7 @@ struct wxPixelDataOut<wxBitmap>
|
||||
// data access
|
||||
// -----------
|
||||
|
||||
// access to invidividual colour components
|
||||
// access to individual colour components
|
||||
ChannelType& Red() { return m_ptr[PixelFormat::RED]; }
|
||||
ChannelType& Green() { return m_ptr[PixelFormat::GREEN]; }
|
||||
ChannelType& Blue() { return m_ptr[PixelFormat::BLUE]; }
|
||||
|
@@ -1977,7 +1977,7 @@ public:
|
||||
|
||||
virtual ~wxRichTextObject();
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
/**
|
||||
Draw the item, within the given range. Some objects may ignore the range (for
|
||||
@@ -2519,7 +2519,7 @@ public:
|
||||
wxRichTextCompositeObject(wxRichTextObject* parent = NULL);
|
||||
virtual ~wxRichTextCompositeObject();
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
/// Hit-testing: returns a flag indicating hit test details, plus
|
||||
/// information about position
|
||||
@@ -2619,7 +2619,7 @@ public:
|
||||
wxRichTextParagraphLayoutBox(const wxRichTextParagraphLayoutBox& obj): wxRichTextCompositeObject() { Init(); Copy(obj); }
|
||||
~wxRichTextParagraphLayoutBox();
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
/// Hit-testing: returns a flag indicating hit test details, plus
|
||||
/// information about position
|
||||
@@ -2955,7 +2955,7 @@ public:
|
||||
|
||||
wxRichTextBox(const wxRichTextBox& obj): wxRichTextParagraphLayoutBox() { Copy(obj); }
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
/**
|
||||
Draws the item.
|
||||
@@ -3017,7 +3017,7 @@ public:
|
||||
wxRichTextLine(const wxRichTextLine& obj) { Init( NULL); Copy(obj); }
|
||||
virtual ~wxRichTextLine() {}
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
// Accessors
|
||||
|
||||
@@ -3114,7 +3114,7 @@ public:
|
||||
virtual ~wxRichTextParagraph();
|
||||
wxRichTextParagraph(const wxRichTextParagraph& obj): wxRichTextCompositeObject() { Copy(obj); }
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
/// Draw the item
|
||||
virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
|
||||
@@ -3245,7 +3245,7 @@ public:
|
||||
wxRichTextPlainText(const wxString& text = wxEmptyString, wxRichTextObject* parent = NULL, wxRichTextAttr* style = NULL);
|
||||
wxRichTextPlainText(const wxRichTextPlainText& obj): wxRichTextObject() { Copy(obj); }
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
/// Draw the item
|
||||
virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
|
||||
@@ -3444,7 +3444,7 @@ public:
|
||||
wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent = NULL, wxRichTextAttr* charStyle = NULL);
|
||||
wxRichTextImage(const wxRichTextImage& obj): wxRichTextObject(obj) { Copy(obj); }
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
/// Draw the item
|
||||
virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
|
||||
@@ -3949,7 +3949,7 @@ public:
|
||||
|
||||
wxRichTextCell(const wxRichTextCell& obj): wxRichTextBox() { Copy(obj); }
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
/**
|
||||
Draws the item.
|
||||
@@ -4017,7 +4017,7 @@ public:
|
||||
|
||||
wxRichTextTable(const wxRichTextTable& obj): wxRichTextBox() { Copy(obj); }
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
// Draws the object.
|
||||
virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
|
||||
@@ -4156,7 +4156,7 @@ protected:
|
||||
// Problem: if boxes are immediate children of a box, this will cause problems
|
||||
// with wxRichTextParagraphLayoutBox functions (and functions elsewhere) that
|
||||
// expect to find just paragraphs. May have to adjust the way we handle the
|
||||
// hierarchy to accept non-paragraph objects in a a paragraph layout box.
|
||||
// hierarchy to accept non-paragraph objects in a paragraph layout box.
|
||||
// We'll be overriding much wxRichTextParagraphLayoutBox functionality so this
|
||||
// may not be such a problem. Perhaps the table should derive from a different
|
||||
// class?
|
||||
|
@@ -88,7 +88,7 @@ public:
|
||||
wxRichTextFormattingDialogFactory() {}
|
||||
virtual ~wxRichTextFormattingDialogFactory() {}
|
||||
|
||||
// Overrideables
|
||||
// Overridables
|
||||
|
||||
/// Create all pages, under the dialog's book control, also calling AddPage
|
||||
virtual bool CreatePages(long pages, wxRichTextFormattingDialog* dialog);
|
||||
|
@@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase;
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
/*
|
||||
Summary of the bits used (some of them are defined in wx/frame.g and
|
||||
Summary of the bits used (some of them are defined in wx/frame.h and
|
||||
wx/dialog.h and not here):
|
||||
|
||||
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
|
||||
|
@@ -1484,7 +1484,7 @@
|
||||
// Recommended setting: 1, required by wxMediaCtrl
|
||||
#define wxUSE_ACTIVEX 1
|
||||
|
||||
// wxDC cacheing implementation
|
||||
// wxDC caching implementation
|
||||
#define wxUSE_DC_CACHEING 1
|
||||
|
||||
// Set this to 1 to enable wxDIB class used internally for manipulating
|
||||
|
@@ -322,7 +322,7 @@ protected:
|
||||
// return the frame icon bitmap
|
||||
virtual wxBitmap GetFrameButtonBitmap(FrameButtonType type) = 0;
|
||||
|
||||
// get the width of either normal or resizeable frame border depending on
|
||||
// get the width of either normal or resizable frame border depending on
|
||||
// whether flags contains wxTOPLEVEL_RESIZEABLE bit
|
||||
//
|
||||
// notice that these methods only make sense with standard border drawing
|
||||
|
@@ -480,7 +480,7 @@ public:
|
||||
// windows this is just the client area of the window, but for
|
||||
// some like scrolled windows it is more or less independent of
|
||||
// the screen window size. You may override the DoXXXVirtual
|
||||
// methods below for classes where that is is the case.
|
||||
// methods below for classes where that is the case.
|
||||
|
||||
void SetVirtualSize( const wxSize &size ) { DoSetVirtualSize( size.x, size.y ); }
|
||||
void SetVirtualSize( int x, int y ) { DoSetVirtualSize( x, y ); }
|
||||
|
Reference in New Issue
Block a user