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:
Dimitri Schoolwerth
2011-04-03 20:31:32 +00:00
parent a17305ea87
commit d13b34d3f2
142 changed files with 235 additions and 235 deletions

View File

@@ -3,7 +3,7 @@ dnl
dnl Provides a test to determine the correct way to call dnl Provides a test to determine the correct way to call
dnl getservbyname_r: dnl getservbyname_r:
dnl dnl
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g linux) dnl - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g. linux)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris) dnl - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1) dnl - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1)
dnl dnl

View File

@@ -534,7 +534,7 @@ if test "$wxUSE_GUI" = "yes"; then
fi fi
done done
else else
dnl try to guess the most apropriate toolkit for this platform dnl try to guess the most appropriate toolkit for this platform
for toolkit in $ALL_TOOLKITS; do for toolkit in $ALL_TOOLKITS; do
var=DEFAULT_DEFAULT_wxUSE_$toolkit var=DEFAULT_DEFAULT_wxUSE_$toolkit
eval "wxUSE_$toolkit=\$${var}" eval "wxUSE_$toolkit=\$${var}"
@@ -4275,7 +4275,7 @@ AC_CHECK_TYPES([mbstate_t],
dnl check for vsnprintf() -- a safe version of vsprintf()) dnl check for vsnprintf() -- a safe version of vsprintf())
dnl dnl
dnl the trouble here is that on some systems (e.g HP-UX 10) this function is dnl the trouble here is that on some systems (e.g. HP-UX 10) this function is
dnl present in libc but not in the system headers and so AC_CHECK_FUNCS (which, dnl present in libc but not in the system headers and so AC_CHECK_FUNCS (which,
dnl stupidly, provides a dummy function declaration inside its extension) dnl stupidly, provides a dummy function declaration inside its extension)
dnl succeeds, even with C++ compiler, but the compilation of wxWidgets fails dnl succeeds, even with C++ compiler, but the compilation of wxWidgets fails

View File

@@ -73,6 +73,6 @@ is an unfortunate reflection of the reality of earlier versions of
wxWindows :-)) to wxBombs. wxWindows :-)) to wxBombs.
3) Added SetClientData to resize the window on Restart; eliminated 3) Added SetClientData to resize the window on Restart; eliminated
scrollbars; made the frame unresizeable. scrollbars; made the frame unresizable.
4) Added makefile.dos for VC++ 1.x, makefile.wat for Watcom C++. 4) Added makefile.dos for VC++ 1.x, makefile.wat for Watcom C++.

View File

@@ -948,7 +948,7 @@ wxMSW:
- Fix centering wxFileDialog and allow positioning it. - Fix centering wxFileDialog and allow positioning it.
- Allow centering wxMessageDialog on its parent window (troelsk). - Allow centering wxMessageDialog on its parent window (troelsk).
- Use vertical scrollbar in wxMessageDialog if it's too big to fit on screen. - Use vertical scrollbar in wxMessageDialog if it's too big to fit on screen.
- Show resize gripper on resizeable dialogs (Kolya Kosenko). - Show resize gripper on resizable dialogs (Kolya Kosenko).
- Implement support for display enumeration under WinCE (Vince Harron). - Implement support for display enumeration under WinCE (Vince Harron).
- Use different Win32 class names in different wx instances (Thomas Hauk). - Use different Win32 class names in different wx instances (Thomas Hauk).
- Support multiline labels for wxCheckBox and wxToggleButton. - Support multiline labels for wxCheckBox and wxToggleButton.
@@ -1720,7 +1720,7 @@ All (GUI):
- Fixed centering of top level windows on secondary displays. - Fixed centering of top level windows on secondary displays.
- Implemented wxDisplay::GetFromWindow() for platforms other than MSW. - Implemented wxDisplay::GetFromWindow() for platforms other than MSW.
- UpdateUI handler can now show/hide the window too (Ronald Weiss). - UpdateUI handler can now show/hide the window too (Ronald Weiss).
- More than one filter allowed in in wxDocTemplate filter. - More than one filter allowed in wxDocTemplate filter.
- Added wxListBox::HitTest(). - Added wxListBox::HitTest().
- Added wxDisplay::GetClientArea(). - Added wxDisplay::GetClientArea().
- Indices and counts in wxControlWithItems derived API are unsigned. - Indices and counts in wxControlWithItems derived API are unsigned.
@@ -2665,7 +2665,7 @@ wxMSW:
- several fixes to owner drawn menu items (Christian Sturmlechner) - several fixes to owner drawn menu items (Christian Sturmlechner)
- wxGauge now supports full 32 bit range (Miroslav Rajcic) - wxGauge now supports full 32 bit range (Miroslav Rajcic)
- make it possible to give focus to the notebook tabs (Hajo Kirchhoff) - make it possible to give focus to the notebook tabs (Hajo Kirchhoff)
- MDI child frames are not always resizeable any more (Andrei Fortuna) - MDI child frames are not always resizable any more (Andrei Fortuna)
- fixed enumerating of entries/groups under '/' in wxRegConfig - fixed enumerating of entries/groups under '/' in wxRegConfig
- added wxSYS_ICONTITLE_FONT (Andreas Pflug) - added wxSYS_ICONTITLE_FONT (Andreas Pflug)
- added wxPATH_NORM_SHORTCUT to wxFileName - added wxPATH_NORM_SHORTCUT to wxFileName
@@ -2772,7 +2772,7 @@ All GUI ports:
- added wxRenderer class allowing to customize the drawing of generic controls - added wxRenderer class allowing to customize the drawing of generic controls
- added wxCLOSE_BOX style for dialogs and frames - added wxCLOSE_BOX style for dialogs and frames
- added wxSplitterWindow and wxWizard handlers to XRC - added wxSplitterWindow and wxWizard handlers to XRC
- wxWizard is now sizer-friendly and may be made resizeable (Robert Vazan) - wxWizard is now sizer-friendly and may be made resizable (Robert Vazan)
- added proportion to wxFlexGridSizer::AddGrowableRow/Col (Maxim Babitski) - added proportion to wxFlexGridSizer::AddGrowableRow/Col (Maxim Babitski)
- added wxFlexGridSizer::SetFlexibleDirection() (Szczepan Holyszewski) - added wxFlexGridSizer::SetFlexibleDirection() (Szczepan Holyszewski)
- implemented GetEditControl for wxGenericTreeCtrl (Peter Stieber) - implemented GetEditControl for wxGenericTreeCtrl (Peter Stieber)
@@ -3533,7 +3533,7 @@ wxMSW:
- wxFileDialog: adjusts struct size if there's an error (struct - wxFileDialog: adjusts struct size if there's an error (struct
sizes can be different on different versions of Windows) sizes can be different on different versions of Windows)
- wxImageList::GetSize() documented and added to wxMSW - wxImageList::GetSize() documented and added to wxMSW
- fixed default dialog style to make them non resizeable again - fixed default dialog style to make them non resizable again
- fixed wxFrame::IsShown() which always returned TRUE before - fixed wxFrame::IsShown() which always returned TRUE before
wxGTK: wxGTK:

View File

@@ -655,13 +655,13 @@ These are the data structure classes supported by wxWidgets.
These classes define objects for performing conversions between different These classes define objects for performing conversions between different
multibyte and Unicode encodings and wide character strings. multibyte and Unicode encodings and wide character strings.
@li wxMBConv: Base class for all convertors, defines the API implemented by all @li wxMBConv: Base class for all converters, defines the API implemented by all
the other convertor classes. the other converter classes.
@li wxMBConvUTF7: Convertor for UTF-7 @li wxMBConvUTF7: Converter for UTF-7
@li wxMBConvUTF8: Convertor for UTF-8 @li wxMBConvUTF8: Converter for UTF-8
@li wxMBConvUTF16: Convertor for UTF-16 @li wxMBConvUTF16: Converter for UTF-16
@li wxMBConvUTF32: Convertor for UTF-32 @li wxMBConvUTF32: Converter for UTF-32
@li wxCSConv: Convertor for any system-supported encoding which can be @li wxCSConv: Converter for any system-supported encoding which can be
specified by name. specified by name.
Related Overviews: @ref overview_mbconv Related Overviews: @ref overview_mbconv

View File

@@ -135,7 +135,7 @@ The organization used by wxWidgets consists in:
- declaring the real widget class inheriting from the Base version in - declaring the real widget class inheriting from the Base version in
platform-specific headers; see for example the wxWidgets' @c "wx/gtk/button.h" file. platform-specific headers; see for example the wxWidgets' @c "wx/gtk/button.h" file.
- separing the different implementations in different source files, putting - separating the different implementations in different source files, putting
all common stuff in a separate source. all common stuff in a separate source.
See for example the wxWidgets' @c "src/common/btncmn.cpp", @c "src/gtk/button.cpp" See for example the wxWidgets' @c "src/common/btncmn.cpp", @c "src/gtk/button.cpp"
and @c "src/msw/button.cpp" files. and @c "src/msw/button.cpp" files.

View File

@@ -68,7 +68,7 @@ and use than MFC and other frameworks.
As well as comprehensive support for the usual widgets, advanced As well as comprehensive support for the usual widgets, advanced
features include: HTML viewing/printing, wxImage class providing features include: HTML viewing/printing, wxImage class providing
handlers for reading and writing many image types, resizeable panels handlers for reading and writing many image types, resizable panels
and dialogs on all platforms, document/view, OpenGL support, and dialogs on all platforms, document/view, OpenGL support,
HTML-based and context-sensitive help, wizards, drag and drop, HTML-based and context-sensitive help, wizards, drag and drop,
a grid class, ODBC support, threads, sockets, container classes, a grid class, ODBC support, threads, sockets, container classes,

View File

@@ -2307,7 +2307,7 @@ enum wxDeprecatedGUIConstants
wxTRANSPARENT, wxTRANSPARENT,
/* Brush & Pen Stippling. Note that a stippled pen cannot be dashed!! */ /* 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_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) */ 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. */ /* drawn with a Pen, and without any Brush -- and it can be stippled. */

View File

@@ -171,7 +171,7 @@ public:
bool IsConnectedEvent() const bool IsConnectedEvent() const
{ return GetEventType() == wxEVT_DIALUP_CONNECTED; } { 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 // process (i.e. does it result from our own attempt to establish the
// connection)? // connection)?
bool IsOwnEvent() const { return m_id != 0; } bool IsOwnEvent() const { return m_id != 0; }

View File

@@ -636,7 +636,7 @@ private: \
// that wants to export a wxArray daubed with your own import/export goo. // 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 // 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 #define wxARRAY_DEFAULT_EXPORT
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -160,7 +160,7 @@ public:
// is successful and after the next Layout the item will be resized. // is successful and after the next Layout the item will be resized.
bool SetSpan( const wxGBSpan& span ); 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); bool Intersects(const wxGBSizerItem& other);
// Returns true if the given pos/span would intersect with this item. // Returns true if the given pos/span would intersect with this item.

View File

@@ -49,7 +49,7 @@ public:
virtual wxControl *AsControl() { return this; } virtual wxControl *AsControl() { return this; }
public: // overrideable public: // overridable
virtual wxDialog *CreateDialog() = 0; virtual wxDialog *CreateDialog() = 0;
@@ -114,7 +114,7 @@ public:
pos, size, style, validator, name); pos, size, style, validator, name);
} }
public: // overrideable public: // overridable
virtual long GetDialogStyle() const virtual long GetDialogStyle() const
{ {
@@ -190,7 +190,7 @@ public:
pos, size, style, validator, name); pos, size, style, validator, name);
} }
public: // overrideable public: // overridable
virtual long GetDialogStyle() const virtual long GetDialogStyle() const
{ {

View File

@@ -81,7 +81,7 @@ protected:
virtual void InitColours(); virtual void InitColours();
// true if the status bar shows the size grip: for this it must have // 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 // and not maximized
bool ShowsSizeGrip() const; bool ShowsSizeGrip() const;

View File

@@ -534,8 +534,8 @@ public:
inline wxSize GetSize() inline wxSize GetSize()
{ return wxSize((int) m_width, (int) m_height); } { 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 // 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 apropriately // 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 wxDouble GetLeft() const { return m_x; }
inline void SetLeft( wxDouble n ) { m_width += m_x - n; m_x = n; } 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 wxPoint2DInt GetPosition() { return wxPoint2DInt(m_x, m_y); }
inline wxSize GetSize() { return wxSize(m_width, m_height); } 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 // 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 apropriately // 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 wxInt32 GetLeft() const { return m_x; }
inline void SetLeft( wxInt32 n ) { m_width += m_x - n; m_x = n; } inline void SetLeft( wxInt32 n ) { m_width += m_x - n; m_x = n; }

View File

@@ -49,7 +49,7 @@ enum
WX_GL_MIN_ACCUM_BLUE, // use blue buffer with most bits (> MIN_ACCUM_BLUE bits) 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_MIN_ACCUM_ALPHA, // use alpha buffer with most bits (> MIN_ACCUM_ALPHA bits)
WX_GL_SAMPLE_BUFFERS, // 1 for multisampling support (antialiasing) 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") #define wxGLCanvasName wxT("GLCanvas")

View File

@@ -46,7 +46,7 @@ public:
virtual void SetSortOrder( bool ascending ); virtual void SetSortOrder( bool ascending );
virtual void SetAsSortKey(bool sort = true); virtual void SetAsSortKey(bool sort = true);
virtual void SetResizeable( bool resizeable ); virtual void SetResizeable( bool resizable );
virtual void SetHidden( bool hidden ); virtual void SetHidden( bool hidden );
virtual void SetMinWidth( int minWidth ); virtual void SetMinWidth( int minWidth );

View File

@@ -155,7 +155,7 @@ public:
void GtkUpdateScrollbar(int orient); void GtkUpdateScrollbar(int orient);
// Called from GTK signal handlers. it indicates that // 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() ). // (i.e. in idle time, implemented in OnInternalIdle() ).
void GtkUpdateSize() { m_sizeSet = false; } void GtkUpdateSize() { m_sizeSet = false; }

View File

@@ -97,7 +97,7 @@ public:
// unspecified/default // unspecified/default
virtual int GetWidth() const = 0; 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) // below the specified size (set to 0 to remove)
virtual int GetMinWidth() const = 0; virtual int GetMinWidth() const = 0;
@@ -177,8 +177,8 @@ public:
void ClearFlag(int flag); void ClearFlag(int flag);
void ToggleFlag(int flag); void ToggleFlag(int flag);
virtual void SetResizeable(bool resizeable) virtual void SetResizeable(bool resizable)
{ ChangeFlag(wxCOL_RESIZABLE, resizeable); } { ChangeFlag(wxCOL_RESIZABLE, resizable); }
virtual void SetSortable(bool sortable) virtual void SetSortable(bool sortable)
{ ChangeFlag(wxCOL_SORTABLE, sortable); } { ChangeFlag(wxCOL_SORTABLE, sortable); }
virtual void SetReorderable(bool reorderable) virtual void SetReorderable(bool reorderable)

View File

@@ -472,11 +472,11 @@ protected:
// Each wxHtmlWindow has it's own parser because sharing one global // Each wxHtmlWindow has it's own parser because sharing one global
// parser would be problematic (because of reentrancy) // parser would be problematic (because of reentrancy)
wxHtmlWinParser *m_Parser; 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; wxString m_OpenedPage;
// contains name of current anchor within m_OpenedPage // contains name of current anchor within m_OpenedPage
wxString m_OpenedAnchor; 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; wxString m_OpenedPageTitle;
// class for opening files (file system) // class for opening files (file system)
wxFileSystem* m_FS; wxFileSystem* m_FS;

View File

@@ -389,7 +389,7 @@ public:
// operations // operations
// expand a string in the format of GetOpenCommand (which may contain // 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). // and %{param} constructions).
static wxString ExpandCommand(const wxString& command, static wxString ExpandCommand(const wxString& command,
const MessageParameters& params); const MessageParameters& params);

View File

@@ -16,7 +16,7 @@
// this option is always enabled (there doesn't seem to be any good reason to // 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 // 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__ #ifdef __WXWINCE__
#define wxUSE_DIALOG_SIZEGRIP 0 #define wxUSE_DIALOG_SIZEGRIP 0
#else #else
@@ -114,7 +114,7 @@ protected:
private: private:
#if wxUSE_DIALOG_SIZEGRIP #if wxUSE_DIALOG_SIZEGRIP
// these functions deal with the gripper window shown in the corner of // these functions deal with the gripper window shown in the corner of
// resizeable dialogs // resizable dialogs
void CreateGripper(); void CreateGripper();
void DestroyGripper(); void DestroyGripper();
void ShowGripper(bool show); void ShowGripper(bool show);

View File

@@ -1485,7 +1485,7 @@
// Recommended setting: 1, required by wxMediaCtrl // Recommended setting: 1, required by wxMediaCtrl
#define wxUSE_ACTIVEX 1 #define wxUSE_ACTIVEX 1
// wxDC cacheing implementation // wxDC caching implementation
#define wxUSE_DC_CACHEING 1 #define wxUSE_DC_CACHEING 1
// Set this to 1 to enable wxDIB class used internally for manipulating // Set this to 1 to enable wxDIB class used internally for manipulating

View File

@@ -63,7 +63,7 @@
// Recommended setting: 1, required by wxMediaCtrl // Recommended setting: 1, required by wxMediaCtrl
#define wxUSE_ACTIVEX 1 #define wxUSE_ACTIVEX 1
// wxDC cacheing implementation // wxDC caching implementation
#define wxUSE_DC_CACHEING 1 #define wxUSE_DC_CACHEING 1
// Set this to 1 to enable wxDIB class used internally for manipulating // Set this to 1 to enable wxDIB class used internally for manipulating

View File

@@ -60,7 +60,7 @@ public:
virtual void SetMaxWidth (int maxWidth); virtual void SetMaxWidth (int maxWidth);
virtual void SetMinWidth (int minWidth); virtual void SetMinWidth (int minWidth);
virtual void SetReorderable(bool reorderable); virtual void SetReorderable(bool reorderable);
virtual void SetResizeable (bool resizeable); virtual void SetResizeable (bool resizable);
virtual void SetSortable (bool sortable); virtual void SetSortable (bool sortable);
virtual void SetSortOrder (bool ascending); virtual void SetSortOrder (bool ascending);
virtual void SetTitle (wxString const& title); virtual void SetTitle (wxString const& title);

View File

@@ -273,7 +273,7 @@
/* /*
Preprocessor in older Borland compilers have major problems Preprocessor in older Borland compilers have major problems
concatenating with ##. Specifically, if the string operands being 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. then ## will not concatenate the operands correctly.
As a workaround, define wxPREPEND* and wxAPPEND* without using As a workaround, define wxPREPEND* and wxAPPEND* without using

View File

@@ -889,7 +889,7 @@ public:
/** /**
Set proportion of a auto-stretchable column. wxPG_SPLITTER_AUTO_CENTER Set proportion of a auto-stretchable column. wxPG_SPLITTER_AUTO_CENTER
window style needs to be used to indicate that columns are auto- window style needs to be used to indicate that columns are auto-
resizeable. resizable.
@returns Returns @false on failure. @returns Returns @false on failure.

View File

@@ -139,7 +139,7 @@ protected:
wxString GetPortCmdArgument(const wxIPV4address& Local, const wxIPV4address& New); wxString GetPortCmdArgument(const wxIPV4address& Local, const wxIPV4address& New);
// accept connection from server in active mode, returns the same socket as // 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); wxSocketBase *AcceptIfActive(wxSocketBase *sock);

View File

@@ -596,7 +596,7 @@ struct wxPixelDataOut<wxBitmap>
// data access // data access
// ----------- // -----------
// access to invidividual colour components // access to individual colour components
ChannelType& Red() { return m_ptr[PixelFormat::RED]; } ChannelType& Red() { return m_ptr[PixelFormat::RED]; }
ChannelType& Green() { return m_ptr[PixelFormat::GREEN]; } ChannelType& Green() { return m_ptr[PixelFormat::GREEN]; }
ChannelType& Blue() { return m_ptr[PixelFormat::BLUE]; } ChannelType& Blue() { return m_ptr[PixelFormat::BLUE]; }

View File

@@ -1977,7 +1977,7 @@ public:
virtual ~wxRichTextObject(); virtual ~wxRichTextObject();
// Overrideables // Overridables
/** /**
Draw the item, within the given range. Some objects may ignore the range (for Draw the item, within the given range. Some objects may ignore the range (for
@@ -2519,7 +2519,7 @@ public:
wxRichTextCompositeObject(wxRichTextObject* parent = NULL); wxRichTextCompositeObject(wxRichTextObject* parent = NULL);
virtual ~wxRichTextCompositeObject(); virtual ~wxRichTextCompositeObject();
// Overrideables // Overridables
/// Hit-testing: returns a flag indicating hit test details, plus /// Hit-testing: returns a flag indicating hit test details, plus
/// information about position /// information about position
@@ -2619,7 +2619,7 @@ public:
wxRichTextParagraphLayoutBox(const wxRichTextParagraphLayoutBox& obj): wxRichTextCompositeObject() { Init(); Copy(obj); } wxRichTextParagraphLayoutBox(const wxRichTextParagraphLayoutBox& obj): wxRichTextCompositeObject() { Init(); Copy(obj); }
~wxRichTextParagraphLayoutBox(); ~wxRichTextParagraphLayoutBox();
// Overrideables // Overridables
/// Hit-testing: returns a flag indicating hit test details, plus /// Hit-testing: returns a flag indicating hit test details, plus
/// information about position /// information about position
@@ -2955,7 +2955,7 @@ public:
wxRichTextBox(const wxRichTextBox& obj): wxRichTextParagraphLayoutBox() { Copy(obj); } wxRichTextBox(const wxRichTextBox& obj): wxRichTextParagraphLayoutBox() { Copy(obj); }
// Overrideables // Overridables
/** /**
Draws the item. Draws the item.
@@ -3017,7 +3017,7 @@ public:
wxRichTextLine(const wxRichTextLine& obj) { Init( NULL); Copy(obj); } wxRichTextLine(const wxRichTextLine& obj) { Init( NULL); Copy(obj); }
virtual ~wxRichTextLine() {} virtual ~wxRichTextLine() {}
// Overrideables // Overridables
// Accessors // Accessors
@@ -3114,7 +3114,7 @@ public:
virtual ~wxRichTextParagraph(); virtual ~wxRichTextParagraph();
wxRichTextParagraph(const wxRichTextParagraph& obj): wxRichTextCompositeObject() { Copy(obj); } wxRichTextParagraph(const wxRichTextParagraph& obj): wxRichTextCompositeObject() { Copy(obj); }
// Overrideables // Overridables
/// Draw the item /// Draw the item
virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); 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 wxString& text = wxEmptyString, wxRichTextObject* parent = NULL, wxRichTextAttr* style = NULL);
wxRichTextPlainText(const wxRichTextPlainText& obj): wxRichTextObject() { Copy(obj); } wxRichTextPlainText(const wxRichTextPlainText& obj): wxRichTextObject() { Copy(obj); }
// Overrideables // Overridables
/// Draw the item /// Draw the item
virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); 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 wxRichTextImageBlock& imageBlock, wxRichTextObject* parent = NULL, wxRichTextAttr* charStyle = NULL);
wxRichTextImage(const wxRichTextImage& obj): wxRichTextObject(obj) { Copy(obj); } wxRichTextImage(const wxRichTextImage& obj): wxRichTextObject(obj) { Copy(obj); }
// Overrideables // Overridables
/// Draw the item /// Draw the item
virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); 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); } wxRichTextCell(const wxRichTextCell& obj): wxRichTextBox() { Copy(obj); }
// Overrideables // Overridables
/** /**
Draws the item. Draws the item.
@@ -4017,7 +4017,7 @@ public:
wxRichTextTable(const wxRichTextTable& obj): wxRichTextBox() { Copy(obj); } wxRichTextTable(const wxRichTextTable& obj): wxRichTextBox() { Copy(obj); }
// Overrideables // Overridables
// Draws the object. // Draws the object.
virtual bool Draw(wxDC& dc, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style); 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 // Problem: if boxes are immediate children of a box, this will cause problems
// with wxRichTextParagraphLayoutBox functions (and functions elsewhere) that // with wxRichTextParagraphLayoutBox functions (and functions elsewhere) that
// expect to find just paragraphs. May have to adjust the way we handle the // 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 // We'll be overriding much wxRichTextParagraphLayoutBox functionality so this
// may not be such a problem. Perhaps the table should derive from a different // may not be such a problem. Perhaps the table should derive from a different
// class? // class?

View File

@@ -88,7 +88,7 @@ public:
wxRichTextFormattingDialogFactory() {} wxRichTextFormattingDialogFactory() {}
virtual ~wxRichTextFormattingDialogFactory() {} virtual ~wxRichTextFormattingDialogFactory() {}
// Overrideables // Overridables
/// Create all pages, under the dialog's book control, also calling AddPage /// Create all pages, under the dialog's book control, also calling AddPage
virtual bool CreatePages(long pages, wxRichTextFormattingDialog* dialog); virtual bool CreatePages(long pages, wxRichTextFormattingDialog* dialog);

View File

@@ -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): wx/dialog.h and not here):
+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+

View File

@@ -1484,7 +1484,7 @@
// Recommended setting: 1, required by wxMediaCtrl // Recommended setting: 1, required by wxMediaCtrl
#define wxUSE_ACTIVEX 1 #define wxUSE_ACTIVEX 1
// wxDC cacheing implementation // wxDC caching implementation
#define wxUSE_DC_CACHEING 1 #define wxUSE_DC_CACHEING 1
// Set this to 1 to enable wxDIB class used internally for manipulating // Set this to 1 to enable wxDIB class used internally for manipulating

View File

@@ -322,7 +322,7 @@ protected:
// return the frame icon bitmap // return the frame icon bitmap
virtual wxBitmap GetFrameButtonBitmap(FrameButtonType type) = 0; 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 // whether flags contains wxTOPLEVEL_RESIZEABLE bit
// //
// notice that these methods only make sense with standard border drawing // notice that these methods only make sense with standard border drawing

View File

@@ -480,7 +480,7 @@ public:
// windows this is just the client area of the window, but for // windows this is just the client area of the window, but for
// some like scrolled windows it is more or less independent of // some like scrolled windows it is more or less independent of
// the screen window size. You may override the DoXXXVirtual // 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( const wxSize &size ) { DoSetVirtualSize( size.x, size.y ); }
void SetVirtualSize( int x, int y ) { DoSetVirtualSize( x, y ); } void SetVirtualSize( int x, int y ) { DoSetVirtualSize( x, y ); }

View File

@@ -372,7 +372,7 @@ public:
/** /**
This function may be called if something fatal happens: an unhandled This function may be called if something fatal happens: an unhandled
exception under Win32 or a a fatal signal under Unix, for example. However, exception under Win32 or a fatal signal under Unix, for example. However,
this will not happen by default: you have to explicitly call this will not happen by default: you have to explicitly call
wxHandleFatalExceptions() to enable this. wxHandleFatalExceptions() to enable this.

View File

@@ -201,7 +201,7 @@ public:
A transparent brush is simply a brush with wxBRUSHSTYLE_TRANSPARENT A transparent brush is simply a brush with wxBRUSHSTYLE_TRANSPARENT
style. style.
Notice that this function works even for non-initialized brushs (for Notice that this function works even for non-initialized brushes (for
which it returns @false) unlike tests of the form <code>GetStyle() == which it returns @false) unlike tests of the form <code>GetStyle() ==
wxBRUSHSTYLE_TRANSPARENT</code> which would assert if the brush is wxBRUSHSTYLE_TRANSPARENT</code> which would assert if the brush is
invalid. invalid.

View File

@@ -104,7 +104,7 @@ public:
/** /**
Returns @true if the caret is visible and @false if it is permanently Returns @true if the caret is visible and @false if it is permanently
hidden (if it is is blinking and not shown currently but will be after hidden (if it is blinking and not shown currently but will be after
the next blink, this method still returns @true). the next blink, this method still returns @true).
*/ */
bool IsVisible() const; bool IsVisible() const;

View File

@@ -37,7 +37,7 @@
This macro can be used in the code which needs to compile with both This macro can be used in the code which needs to compile with both
wxWidgets 2 and 3 versions in places where v2 API requires a Unicode string wxWidgets 2 and 3 versions in places where v2 API requires a Unicode string
(in Unicode build) and v3 API only accepts a standard standard narrow (in Unicode build) and v3 API only accepts a standard narrow
string as in e.g. wxCmdLineEntryDesc structure objects initializers. string as in e.g. wxCmdLineEntryDesc structure objects initializers.
Example of use: Example of use:

View File

@@ -75,7 +75,7 @@ public:
know the ordering of Undos; the user can never Undo at an arbitrary know the ordering of Undos; the user can never Undo at an arbitrary
position in the command history. position in the command history.
- Restore the entire document state (perhaps using document - Restore the entire document state (perhaps using document
transactioning). Potentially very inefficient, but possibly easier to transacting). Potentially very inefficient, but possibly easier to
code if the user interface and data are complex, and an "inverse code if the user interface and data are complex, and an "inverse
execute" operation is hard to write. The docview sample uses the execute" operation is hard to write. The docview sample uses the
first method, to remove or restore segments in the drawing. first method, to remove or restore segments in the drawing.

View File

@@ -25,7 +25,7 @@ public:
of colour data, which will be copied to the colour dialog's colour of colour data, which will be copied to the colour dialog's colour
data. data.
Custom colours from colour data object will be be used in the dialog's Custom colours from colour data object will be used in the dialog's
colour palette. Invalid entries in custom colours list will be ignored colour palette. Invalid entries in custom colours list will be ignored
on some platforms(GTK) or replaced with white colour on platforms where on some platforms(GTK) or replaced with white colour on platforms where
custom colours palette has fixed size (MSW). custom colours palette has fixed size (MSW).

View File

@@ -187,7 +187,7 @@ public:
/** /**
Sets the RGB intensity values using the given values (first overload), Sets the RGB intensity values using the given values (first overload),
extracting them from the packed long (second overload), using the given extracting them from the packed long (second overload), using the given
string (third overloard). string (third overload).
When using third form, Set() accepts: colour names (those listed in When using third form, Set() accepts: colour names (those listed in
wxColourDatabase), the CSS-like @c "rgb(r,g,b)" or @c "rgba(r,g,b,a)" syntax wxColourDatabase), the CSS-like @c "rgb(r,g,b)" or @c "rgba(r,g,b,a)" syntax

View File

@@ -87,7 +87,7 @@ public:
void SetCustomColour(int i, const wxColour& colour); void SetCustomColour(int i, const wxColour& colour);
/** /**
Converts the colours saved in this class in a string form, separing Converts the colours saved in this class in a string form, separating
the various colours with a comma. the various colours with a comma.
*/ */
wxString ToString() const; wxString ToString() const;

View File

@@ -312,7 +312,7 @@ public:
@n The @c wxCONFIG_USE_NO_ESCAPE_CHARACTERS style can be helpful if your @n The @c wxCONFIG_USE_NO_ESCAPE_CHARACTERS style can be helpful if your
config file must be read or written to by a non-wxWidgets program config file must be read or written to by a non-wxWidgets program
(which might not understand the escape characters). Note, however, (which might not understand the escape characters). Note, however,
that if @c wxCONFIG_USE_NO_ESCAPE_CHARACTERS style is used, it is is that if @c wxCONFIG_USE_NO_ESCAPE_CHARACTERS style is used, it is
now your application's responsibility to ensure that there is no now your application's responsibility to ensure that there is no
newline or other illegal characters in a value, before writing that newline or other illegal characters in a value, before writing that
value to the file. value to the file.
@@ -763,7 +763,7 @@ public:
/** /**
Delete the whole underlying object (disk file, registry key, ...). Delete the whole underlying object (disk file, registry key, ...).
Primarly for use by uninstallation routine. Primarily for use by uninstallation routine.
*/ */
virtual bool DeleteAll() = 0; virtual bool DeleteAll() = 0;

View File

@@ -36,7 +36,7 @@ public:
@param stream @param stream
The output stream. The output stream.
@param conv @param conv
Charset conversion object object used to encoding Unicode strings Charset conversion object used to encoding Unicode strings
before writing them to the stream in Unicode mode (see before writing them to the stream in Unicode mode (see
WriteString() for a detailed description). Note that you must not WriteString() for a detailed description). Note that you must not
destroy @a conv before you destroy this wxDataOutputStream destroy @a conv before you destroy this wxDataOutputStream
@@ -184,7 +184,7 @@ public:
@param stream @param stream
The input stream. The input stream.
@param conv @param conv
Charset conversion object object used to decode strings in Unicode Charset conversion object used to decode strings in Unicode
mode (see ReadString() for a detailed description). Note that you mode (see ReadString() for a detailed description). Note that you
must not destroy @a conv before you destroy this wxDataInputStream must not destroy @a conv before you destroy this wxDataInputStream
instance! instance!
@@ -272,7 +272,7 @@ public:
In Unicode build of wxWidgets, the fuction first reads multibyte In Unicode build of wxWidgets, the fuction first reads multibyte
(char*) string from the stream and then converts it to Unicode using (char*) string from the stream and then converts it to Unicode using
the @e conv object passed to constructor and returns the result as the @e conv object passed to constructor and returns the result as
wxString. You are responsible for using the same convertor as when wxString. You are responsible for using the same converter as when
writing the stream. writing the stream.
@see wxDataOutputStream::WriteString() @see wxDataOutputStream::WriteString()

View File

@@ -120,7 +120,7 @@ public:
The difference between wxBufferedPaintDC and this class is that this class The difference between wxBufferedPaintDC and this class is that this class
won't double-buffer on platforms which have native double-buffering won't double-buffer on platforms which have native double-buffering
already, avoiding any unneccessary buffering to avoid flicker. already, avoiding any unnecessary buffering to avoid flicker.
wxAutoBufferedPaintDC is simply a typedef of wxPaintDC on platforms that wxAutoBufferedPaintDC is simply a typedef of wxPaintDC on platforms that
have native double-buffering, otherwise, it is a typedef of have native double-buffering, otherwise, it is a typedef of

View File

@@ -253,7 +253,7 @@ public:
/** /**
Retrieves the name (relative to GetDirectory()) and the description of Retrieves the name (relative to GetDirectory()) and the description of
the file with the given index. If @a n is greater than or equal to the the file with the given index. If @a n is greater than or equal to the
number of filse, @false is returned. number of files, then @false is returned.
*/ */
bool GetFile(size_t n, wxString* name, wxString* desc) const; bool GetFile(size_t n, wxString* name, wxString* desc) const;

View File

@@ -33,7 +33,7 @@ enum wxOrientation
*/ */
wxBOTH = wxVERTICAL | wxHORIZONTAL, wxBOTH = wxVERTICAL | wxHORIZONTAL,
/// A synonim for @c wxBOTH. /// A synonym for @c wxBOTH.
wxORIENTATION_MASK = wxBOTH wxORIENTATION_MASK = wxBOTH
}; };

View File

@@ -88,7 +88,7 @@ enum wxDialogLayoutAdaptationMode
Equivalent to a combination of wxCAPTION, wxCLOSE_BOX and Equivalent to a combination of wxCAPTION, wxCLOSE_BOX and
wxSYSTEM_MENU (the last one is not used under Unix). wxSYSTEM_MENU (the last one is not used under Unix).
@style{wxRESIZE_BORDER} @style{wxRESIZE_BORDER}
Display a resizeable frame around the window. Display a resizable frame around the window.
@style{wxSYSTEM_MENU} @style{wxSYSTEM_MENU}
Display a system menu. Display a system menu.
@style{wxCLOSE_BOX} @style{wxCLOSE_BOX}
@@ -638,7 +638,7 @@ public:
/** /**
@class wxDialogLayoutAdapter @class wxDialogLayoutAdapter
This abstract class is the base for classes that help wxWidgets peform This abstract class is the base for classes that help wxWidgets perform
run-time layout adaptation of dialogs. Principally, this is to cater for run-time layout adaptation of dialogs. Principally, this is to cater for
small displays by making part of the dialog scroll, but the application small displays by making part of the dialog scroll, but the application
developer may find other uses for layout adaption. developer may find other uses for layout adaption.

View File

@@ -207,7 +207,7 @@ public:
bool IsConnectedEvent() const; bool IsConnectedEvent() const;
/** /**
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 process (i.e. does it result from our own attempt to establish the
connection)? connection)?
*/ */

View File

@@ -683,7 +683,7 @@ public:
@param noTemplates @param noTemplates
Number of templates being pointed to by the templates pointer. Number of templates being pointed to by the templates pointer.
@param sort @param sort
If more than one template is passed in in templates, then this If more than one template is passed into templates, then this
parameter indicates whether the list of templates that the user parameter indicates whether the list of templates that the user
will have to choose from is sorted or not when shown the choice box will have to choose from is sorted or not when shown the choice box
dialog. Default is @false. dialog. Default is @false.
@@ -709,7 +709,7 @@ public:
@param noTemplates @param noTemplates
Number of templates being pointed to by the templates pointer. Number of templates being pointed to by the templates pointer.
@param sort @param sort
If more than one template is passed in in templates, then this If more than one template is passed into templates, then this
parameter indicates whether the list of templates that the user parameter indicates whether the list of templates that the user
will have to choose from is sorted or not when shown the choice box will have to choose from is sorted or not when shown the choice box
dialog. Default is @false. dialog. Default is @false.

View File

@@ -124,7 +124,7 @@
however dumb, C++ compiler in the world. however dumb, C++ compiler in the world.
Remember to include @<wx/arrimpl.cpp@> just before each Remember to include @<wx/arrimpl.cpp@> just before each
WX_DEFINE_OBJARRAY() ocurrence in your code, even if you have several in WX_DEFINE_OBJARRAY() occurrence in your code, even if you have several in
the same file. the same file.
Things are much simpler for wxArray and wxSortedArray however: it is enough Things are much simpler for wxArray and wxSortedArray however: it is enough

View File

@@ -67,7 +67,7 @@ class wxFindDialogEvent : public wxCommandEvent
{ {
public: public:
/** /**
Constuctor used by wxWidgets only. Constructor used by wxWidgets only.
*/ */
wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, wxFindDialogEvent(wxEventType commandType = wxEVT_NULL,
int id = 0); int id = 0);
@@ -117,7 +117,7 @@ class wxFindReplaceData : public wxObject
{ {
public: public:
/** /**
Constuctor initializes the flags to default value (0). Constructor initializes the flags to default value (0).
*/ */
wxFindReplaceData(wxUint32 flags = 0); wxFindReplaceData(wxUint32 flags = 0);

View File

@@ -106,7 +106,7 @@ public:
void Detach(); void Detach();
/** /**
Returns @true if the an attempt has been made to read @e past Returns @true if an attempt has been made to read @e past
the end of the file. the end of the file.
Note that the behaviour of the file descriptor based class wxFile is different as Note that the behaviour of the file descriptor based class wxFile is different as

View File

@@ -129,7 +129,7 @@ wxULongLong wxInvalidSize;
wxFileName::IsDirReadable() use wxFileName::GetPath() whereas methods dealing wxFileName::IsDirReadable() use wxFileName::GetPath() whereas methods dealing
with file names like wxFileName::IsFileReadable() use wxFileName::GetFullPath(). with file names like wxFileName::IsFileReadable() use wxFileName::GetFullPath().
If it is not known wether a string contains a directory name or a complete If it is not known whether a string contains a directory name or a complete
file name (such as when interpreting user input) you need to use the static file name (such as when interpreting user input) you need to use the static
function wxFileName::DirExists() (or its identical variants wxDir::Exists() and function wxFileName::DirExists() (or its identical variants wxDir::Exists() and
wxDirExists()) and construct the wxFileName instance accordingly. wxDirExists()) and construct the wxFileName instance accordingly.
@@ -332,7 +332,7 @@ public:
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
/** /**
Creates the file name from volumne, path, name and extension. Creates the file name from volume, path, name and extension.
*/ */
void Assign(const wxString& volume, const wxString& path, void Assign(const wxString& volume, const wxString& path,
const wxString& name, const wxString& name,
@@ -341,7 +341,7 @@ public:
wxPathFormat format = wxPATH_NATIVE); wxPathFormat format = wxPATH_NATIVE);
/** /**
Creates the file name from volumne, path, name and extension. Creates the file name from volume, path, name and extension.
*/ */
void Assign(const wxString& volume, const wxString& path, void Assign(const wxString& volume, const wxString& path,
const wxString& name, const wxString& name,
@@ -558,7 +558,7 @@ public:
suffixes of B, KB, MB, GB, TB for bytes, kilobytes, megabytes, suffixes of B, KB, MB, GB, TB for bytes, kilobytes, megabytes,
gigabytes and terabytes respectively. With the IEC convention the names gigabytes and terabytes respectively. With the IEC convention the names
of the units are changed to B, KiB, MiB, GiB and TiB for bytes, of the units are changed to B, KiB, MiB, GiB and TiB for bytes,
kibibytes, mebibyes, gibibytes and tebibytes. Finally, with SI kibibytes, mebibytes, gibibytes and tebibytes. Finally, with SI
convention the same B, KB, MB, GB and TB suffixes are used but in their convention the same B, KB, MB, GB and TB suffixes are used but in their
correct SI meaning, i.e. as multiples of 1000 and not 1024. correct SI meaning, i.e. as multiples of 1000 and not 1024.

View File

@@ -70,7 +70,7 @@
recommended to only use it together with wxCAPTION for consistent recommended to only use it together with wxCAPTION for consistent
behaviour under all platforms. behaviour under all platforms.
@style{wxRESIZE_BORDER} @style{wxRESIZE_BORDER}
Displays a resizeable border around the window. Displays a resizable border around the window.
@style{wxFRAME_TOOL_WINDOW} @style{wxFRAME_TOOL_WINDOW}
Causes a frame with a small title bar to be created; the frame does Causes a frame with a small title bar to be created; the frame does
not appear in the taskbar under Windows or GTK+. not appear in the taskbar under Windows or GTK+.
@@ -89,7 +89,7 @@
with the SetShape() method. with the SetShape() method.
@endStyleTable @endStyleTable
The default frame style is for normal, resizeable frames. The default frame style is for normal, resizable frames.
To create a frame which cannot be resized by user, you may use the following To create a frame which cannot be resized by user, you may use the following
combination of styles: combination of styles:

View File

@@ -160,7 +160,7 @@ public:
@class wxFileSystemWatcherEvent @class wxFileSystemWatcherEvent
A class of events sent when a file system event occurs. Types of events A class of events sent when a file system event occurs. Types of events
reported may vary depending on a platfrom, however all platforms report reported may vary depending on a platform, however all platforms report
at least creation of new file/directory and access, modification, move at least creation of new file/directory and access, modification, move
(rename) or deletion of an existing one. (rename) or deletion of an existing one.

View File

@@ -217,7 +217,7 @@ public:
The wxGBSizerItem class is used by the wxGridBagSizer for tracking the The wxGBSizerItem class is used by the wxGridBagSizer for tracking the
items in the sizer. It adds grid position and spanning information to the items in the sizer. It adds grid position and spanning information to the
normal wxSizerItem by adding wxGBPosition and wxGBSpan attrbibutes. Most of normal wxSizerItem by adding wxGBPosition and wxGBSpan attributes. Most of
the time you will not need to use a wxGBSizerItem directly in your code, the time you will not need to use a wxGBSizerItem directly in your code,
but there are a couple of cases where it is handy. but there are a couple of cases where it is handy.
@@ -268,7 +268,7 @@ public:
//@} //@}
/** /**
Returns @true if this item and the @a other item instersect. Returns @true if this item and the @a other item intersect.
*/ */
bool Intersects(const wxGBSizerItem& other); bool Intersects(const wxGBSizerItem& other);
/** /**

View File

@@ -150,8 +150,8 @@ public:
wxPoint2DDouble GetPosition(); wxPoint2DDouble GetPosition();
wxSize GetSize(); wxSize GetSize();
// for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their // 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 apropriately // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately
wxDouble GetLeft() const; wxDouble GetLeft() const;
void SetLeft( wxDouble n ); void SetLeft( wxDouble n );
@@ -241,8 +241,8 @@ public:
wxPoint2DInt GetPosition(); wxPoint2DInt GetPosition();
wxSize GetSize(); wxSize GetSize();
// for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their // 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 apropriately // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately
wxInt32 GetLeft() const; wxInt32 GetLeft() const;
void SetLeft( wxInt32 n ); void SetLeft( wxInt32 n );

View File

@@ -137,7 +137,7 @@ enum
/// 1 for multisampling support (antialiasing) /// 1 for multisampling support (antialiasing)
WX_GL_SAMPLE_BUFFERS, WX_GL_SAMPLE_BUFFERS,
/// 4 for 2x2 antialising supersampling on most graphics cards /// 4 for 2x2 antialiasing supersampling on most graphics cards
WX_GL_SAMPLES WX_GL_SAMPLES
}; };
@@ -215,7 +215,7 @@ public:
constants. If a constant should be followed by a value, put it in constants. If a constant should be followed by a value, put it in
the next array position. For example, WX_GL_DEPTH_SIZE should be the next array position. For example, WX_GL_DEPTH_SIZE should be
followed by the value that indicates the number of bits for the followed by the value that indicates the number of bits for the
depth buffer, e.g: depth buffer, e.g.:
@code @code
attribList[n++] = WX_GL_DEPTH_SIZE; attribList[n++] = WX_GL_DEPTH_SIZE;
attribList[n++] = 32; attribList[n++] = 32;

View File

@@ -403,7 +403,7 @@ public:
/** /**
Creates a native brush with a radial gradient. Creates a native brush with a radial gradient.
The brush originats at (@a xo, @a yc) and ends on a circle around The brush originates at (@a xo, @a yc) and ends on a circle around
(@a xc, @a yc) with the given @a radius. (@a xc, @a yc) with the given @a radius.
The gradient may be specified either by its start and end colours @a The gradient may be specified either by its start and end colours @a

View File

@@ -1630,7 +1630,7 @@ struct wxGridSizesInfo
The default table class is called wxGridStringTable and holds an array of The default table class is called wxGridStringTable and holds an array of
strings. An instance of such a class is created by CreateGrid(). strings. An instance of such a class is created by CreateGrid().
wxGridCellRenderer is the abstract base class for rendereing contents in a wxGridCellRenderer is the abstract base class for rendering contents in a
cell. The following renderers are predefined: cell. The following renderers are predefined:
- wxGridCellBoolRenderer - wxGridCellBoolRenderer
@@ -2781,7 +2781,7 @@ public:
@a resizeExistingRows is @true. @a resizeExistingRows is @true.
If @a height is less than GetRowMinimalAcceptableHeight(), then the If @a height is less than GetRowMinimalAcceptableHeight(), then the
minimal acceptable heihgt is used instead of it. minimal acceptable height is used instead of it.
*/ */
void SetDefaultRowSize(int height, bool resizeExistingRows = false); void SetDefaultRowSize(int height, bool resizeExistingRows = false);
@@ -3009,7 +3009,7 @@ public:
Notice that currently there is no way to make some columns resizable in Notice that currently there is no way to make some columns resizable in
a grid where columns can't be resized by default as there doesn't seem a grid where columns can't be resized by default as there doesn't seem
to be any need for this in practice. There is also no way to make the to be any need for this in practice. There is also no way to make the
column marked as fixed using this method resizeable again because it is column marked as fixed using this method resizable again because it is
supposed that fixed columns are used for static parts of the grid and supposed that fixed columns are used for static parts of the grid and
so should remain fixed during the entire grid lifetime. so should remain fixed during the entire grid lifetime.

View File

@@ -221,7 +221,7 @@ public:
/** /**
Set the minimal column width. Set the minimal column width.
This method can be used with resizeable columns (i.e. those for which This method can be used with resizable columns (i.e. those for which
wxCOL_RESIZABLE flag is set in GetFlags() or, alternatively, wxCOL_RESIZABLE flag is set in GetFlags() or, alternatively,
IsResizeable() returns @true) to prevent the user from making them IsResizeable() returns @true) to prevent the user from making them
narrower than the given width. narrower than the given width.
@@ -302,11 +302,11 @@ public:
Call this to enable or disable interactive resizing of the column by Call this to enable or disable interactive resizing of the column by
the user. the user.
By default, the columns are resizeable. By default, the columns are resizable.
Equivalent to ChangeFlag(wxCOL_RESIZABLE, resizeable). Equivalent to ChangeFlag(wxCOL_RESIZABLE, resizable).
*/ */
virtual void SetResizeable(bool resizeable); virtual void SetResizeable(bool resizable);
/** /**
Allow clicking the column to sort the control contents by the field in Allow clicking the column to sort the control contents by the field in

View File

@@ -208,7 +208,7 @@ public:
virtual bool LoadFile(const wxString& file = wxEmptyString); virtual bool LoadFile(const wxString& file = wxEmptyString);
/** /**
Overrideable member called when this application's viewer is quit by the user. Overridable member called when this application's viewer is quit by the user.
This does not work for all help controllers. This does not work for all help controllers.
*/ */
virtual bool OnQuit(); virtual bool OnQuit();

View File

@@ -56,7 +56,7 @@ public:
/** /**
Sets the help controller associated with the dialog. Sets the help controller associated with the dialog.
*/ */
void SetController(wxHtmlHelpController* contoller); void SetController(wxHtmlHelpController* controller);
/** /**
Sets the dialog's title format. Sets the dialog's title format.

View File

@@ -59,7 +59,7 @@ public:
/** /**
Sets the help controller associated with the frame. Sets the help controller associated with the frame.
*/ */
void SetController(wxHtmlHelpController* contoller); void SetController(wxHtmlHelpController* controller);
/** /**
Sets the frame's title format. Sets the frame's title format.

View File

@@ -12,7 +12,7 @@
This class has been rewritten to be type safe and to provide the full API of This class has been rewritten to be type safe and to provide the full API of
the STL std::list container and should be used like it. the STL std::list container and should be used like it.
The exception is that wxList<T> actually stores pointers and therefore its The exception is that wxList<T> actually stores pointers and therefore its
iterators return pointers and not references to the actual objets in the list iterators return pointers and not references to the actual objects in the list
(see example below) and @e value_type is defined as @e T*. (see example below) and @e value_type is defined as @e T*.
wxList<T> destroys an object after removing it only if wxList<T>::DeleteContents wxList<T> destroys an object after removing it only if wxList<T>::DeleteContents
has been called. has been called.
@@ -132,7 +132,7 @@ public:
void DeleteContents(bool destroy); void DeleteContents(bool destroy);
/** /**
Deletes the given element refered to by @a iter from the list Deletes the given element referred to by @a iter from the list
if @a iter is a valid iterator. Returns @true if successful. if @a iter is a valid iterator. Returns @true if successful.
Deletes the actual object if DeleteContents( @true ) was called previously. Deletes the actual object if DeleteContents( @true ) was called previously.
@@ -148,9 +148,9 @@ public:
bool DeleteObject(T* object); bool DeleteObject(T* object);
/** /**
Removes element refered to be @a iter. Removes element referred to be @a iter.
Deletes the actualy object if DeleteContents( @true ) was called previously. Deletes the actual object if DeleteContents( @true ) was called previously.
*/ */
void Erase(const compatibility_iterator& iter); void Erase(const compatibility_iterator& iter);
@@ -192,7 +192,7 @@ public:
T* object); T* object);
/** /**
Inserts @a object before the object refered to be @a iter. Inserts @a object before the object referred to be @a iter.
*/ */
wxList<T>::compatibility_iterator Insert(compatibility_iterator iter, wxList<T>::compatibility_iterator Insert(compatibility_iterator iter,
T* object); T* object);

View File

@@ -575,7 +575,7 @@ public:
coordinates, of the given subitem, i.e. the part of the row @a item in the coordinates, of the given subitem, i.e. the part of the row @a item in the
column @a subItem. column @a subItem.
This method is only meaningfull when the wxListCtrl is in the report mode. This method is only meaningful when the wxListCtrl is in the report mode.
If @a subItem parameter is equal to the special value If @a subItem parameter is equal to the special value
@c wxLIST_GETSUBITEMRECT_WHOLEITEM the return value is the same as @c wxLIST_GETSUBITEMRECT_WHOLEITEM the return value is the same as
for GetItemRect(). for GetItemRect().

View File

@@ -747,7 +747,7 @@ public:
Note that the latter must be called the same number of times as the former Note that the latter must be called the same number of times as the former
to undo it, i.e. if you call Suspend() twice you must call Resume() twice as well. to undo it, i.e. if you call Suspend() twice you must call Resume() twice as well.
Note that suspending the logging means that the log sink won't be be flushed Note that suspending the logging means that the log sink won't be flushed
periodically, it doesn't have any effect if the current log target does the periodically, it doesn't have any effect if the current log target does the
logging immediately without waiting for Flush() to be called (the standard logging immediately without waiting for Flush() to be called (the standard
GUI log target only shows the log dialog when it is flushed, so Suspend() GUI log target only shows the log dialog when it is flushed, so Suspend()
@@ -869,7 +869,7 @@ public:
/** /**
Sets the timestamp format prepended by the default log targets to all Sets the timestamp format prepended by the default log targets to all
messages. The string may contain any normal characters as well as % messages. The string may contain any normal characters as well as %
prefixed format specificators, see @e strftime() manual for details. prefixed format specifiers, see @e strftime() manual for details.
Passing an empty string to this function disables message time stamping. Passing an empty string to this function disables message time stamping.
*/ */
static void SetTimestamp(const wxString& format); static void SetTimestamp(const wxString& format);

View File

@@ -349,7 +349,7 @@ public:
/** /**
Sets the label associated with the menu item. Sets the label associated with the menu item.
Note that if the ID of this menu item corrisponds to a stock ID, then it is Note that if the ID of this menu item corresponds to a stock ID, then it is
not necessary to specify a label: wxWidgets will automatically use the stock not necessary to specify a label: wxWidgets will automatically use the stock
item label associated with that ID. See the @ref wxMenuItem::wxMenuItem "constructor" item label associated with that ID. See the @ref wxMenuItem::wxMenuItem "constructor"
for more info. for more info.

View File

@@ -35,7 +35,7 @@
@style{wxSYSTEM_MENU} @style{wxSYSTEM_MENU}
Displays a system menu (Windows and Motif only). Displays a system menu (Windows and Motif only).
@style{wxRESIZE_BORDER} @style{wxRESIZE_BORDER}
Displays a resizeable border around the window. Displays a resizable border around the window.
@endStyleTable @endStyleTable
@remarks @remarks

View File

@@ -747,14 +747,14 @@ public:
void MapScreenSizeToDevice(); void MapScreenSizeToDevice();
/** /**
This sets the user scale of the wxDC assocated with this wxPrintout to the same This sets the user scale of the wxDC associated with this wxPrintout to the same
scale as MapScreenSizeToPaper() but sets the logical origin to the top left corner scale as MapScreenSizeToPaper() but sets the logical origin to the top left corner
of the page rectangle. of the page rectangle.
*/ */
void MapScreenSizeToPage(); void MapScreenSizeToPage();
/** /**
This sets the user scale of the wxDC assocated with this wxPrintout to the same This sets the user scale of the wxDC associated with this wxPrintout to the same
scale as MapScreenSizeToPageMargins() but sets the logical origin to the top left scale as MapScreenSizeToPageMargins() but sets the logical origin to the top left
corner of the page margins specified by the given wxPageSetupDialogData object. corner of the page margins specified by the given wxPageSetupDialogData object.
*/ */

View File

@@ -169,7 +169,7 @@ public:
wxInputStream* GetInputStream() const; wxInputStream* GetInputStream() const;
/** /**
It returns an output stream correspoding to the input stream of the subprocess. It returns an output stream corresponding to the input stream of the subprocess.
If it is @NULL, you have not turned on the redirection or already If it is @NULL, you have not turned on the redirection or already
called CloseOutput(). called CloseOutput().

View File

@@ -720,7 +720,7 @@ public:
/** /**
Set proportion of a auto-stretchable column. wxPG_SPLITTER_AUTO_CENTER Set proportion of a auto-stretchable column. wxPG_SPLITTER_AUTO_CENTER
window style needs to be used to indicate that columns are auto- window style needs to be used to indicate that columns are auto-
resizeable. resizable.
@returns Returns @false on failure. @returns Returns @false on failure.

View File

@@ -202,7 +202,7 @@ public:
//@{ //@{
/** /**
Data Access: Access to invidividual colour components. Data Access: Access to individual colour components.
*/ */
ChannelType& Red(); ChannelType& Red();
ChannelType& Green(); ChannelType& Green();

View File

@@ -106,7 +106,7 @@ public:
/** /**
If sizing is not continuous, then return a suitable size for the control If sizing is not continuous, then return a suitable size for the control
which is larger then the current size. which is larger than the current size.
@param direction @param direction
The direction(s) in which the size should increase. The direction(s) in which the size should increase.
@@ -121,7 +121,7 @@ public:
/** /**
If sizing is not continuous, then return a suitable size for the control If sizing is not continuous, then return a suitable size for the control
which is larger then the given size. which is larger than the given size.
@param direction @param direction
The direction(s) in which the size should increase. The direction(s) in which the size should increase.

View File

@@ -141,9 +141,9 @@ public:
Show the panel externally expanded. Show the panel externally expanded.
When a panel is minimised, it can be shown full-size in a pop-out When a panel is minimised, it can be shown full-size in a pop-out
window, which is refered to as being (externally) expanded. Note that window, which is referred to as being (externally) expanded. Note that
when a panel is expanded, there exist two panels - the original panel when a panel is expanded, there exist two panels - the original panel
(which is refered to as the dummy panel) and the expanded panel. The (which is referred to as the dummy panel) and the expanded panel. The
original is termed a dummy as it sits in the ribbon bar doing nothing, original is termed a dummy as it sits in the ribbon bar doing nothing,
while the expanded panel holds the panel children. while the expanded panel holds the panel children.

View File

@@ -32,7 +32,7 @@ enum wxScrollbarVisibility
- ::wxScrolledCanvas, aka wxScrolled<wxWindow>, derives from wxWindow and - ::wxScrolledCanvas, aka wxScrolled<wxWindow>, derives from wxWindow and
so doesn't handle children specially. This is suitable e.g. for so doesn't handle children specially. This is suitable e.g. for
implementating scrollable controls such as tree or list controls. implementing scrollable controls such as tree or list controls.
Starting from version 2.4 of wxWidgets, there are several ways to use a Starting from version 2.4 of wxWidgets, there are several ways to use a
::wxScrolledWindow (and now wxScrolled). In particular, there are ::wxScrolledWindow (and now wxScrolled). In particular, there are

View File

@@ -75,7 +75,7 @@ enum wxSystemColour
wxSYS_COLOUR_3DLIGHT, //!< Light colour for three-dimensional display elements. wxSYS_COLOUR_3DLIGHT, //!< Light colour for three-dimensional display elements.
wxSYS_COLOUR_INFOTEXT, //!< Text colour for tooltip controls. wxSYS_COLOUR_INFOTEXT, //!< Text colour for tooltip controls.
wxSYS_COLOUR_INFOBK, //!< Background colour for tooltip controls. wxSYS_COLOUR_INFOBK, //!< Background colour for tooltip controls.
wxSYS_COLOUR_LISTBOX, //!< Background colour for list-like contols. wxSYS_COLOUR_LISTBOX, //!< Background colour for list-like controls.
wxSYS_COLOUR_HOTLIGHT, //!< Colour for a hyperlink or hot-tracked item. wxSYS_COLOUR_HOTLIGHT, //!< Colour for a hyperlink or hot-tracked item.
/** /**
@@ -136,7 +136,7 @@ enum wxSystemColour
//!< Synonym for @c wxSYS_COLOUR_BTNHIGHLIGHT. //!< Synonym for @c wxSYS_COLOUR_BTNHIGHLIGHT.
/** /**
Synonim for @c wxSYS_COLOUR_BTNFACE. Synonym for @c wxSYS_COLOUR_BTNFACE.
On wxMSW this colour should be used as the background colour of On wxMSW this colour should be used as the background colour of
wxFrames which are used as containers of controls; this is in fact the wxFrames which are used as containers of controls; this is in fact the
@@ -273,7 +273,7 @@ public:
The value of @a win determines if the metric returned is a global value or The value of @a win determines if the metric returned is a global value or
a wxWindow based value, in which case it might determine the widget, the a wxWindow based value, in which case it might determine the widget, the
display the window is on, or something similar. The window given should be as display the window is on, or something similar. The window given should be as
close to the metric as possible (e.g a wxTopLevelWindow in case of the close to the metric as possible (e.g. a wxTopLevelWindow in case of the
wxSYS_CAPTION_Y metric). wxSYS_CAPTION_Y metric).
@a index can be one of the ::wxSystemMetric enum values. @a index can be one of the ::wxSystemMetric enum values.

View File

@@ -41,7 +41,7 @@
@style{wxSL_SELRANGE} @style{wxSL_SELRANGE}
Allows the user to select a range on the slider. Windows only. Allows the user to select a range on the slider. Windows only.
@style{wxSL_INVERSE} @style{wxSL_INVERSE}
Inverses the mininum and maximum endpoints on the slider. Not Inverses the minimum and maximum endpoints on the slider. Not
compatible with wxSL_SELRANGE. compatible with wxSL_SELRANGE.
@endStyleTable @endStyleTable

View File

@@ -14,7 +14,7 @@
The line may be only vertical or horizontal. Moreover, not all ports The line may be only vertical or horizontal. Moreover, not all ports
(notably not wxGTK) support specifying the transversal direction of the (notably not wxGTK) support specifying the transversal direction of the
line (e.g. height for a horizontal line) so for maximial portability you line (e.g. height for a horizontal line) so for maximal portability you
should specify it as wxDefaultCoord. should specify it as wxDefaultCoord.
@beginStyleTable @beginStyleTable

View File

@@ -277,7 +277,7 @@ public:
/** /**
@deprecated This function is deprecated, please use ToWChar() instead. @deprecated This function is deprecated, please use ToWChar() instead.
Converts from a string @a in in multibyte encoding to Unicode putting up to Converts from a string @a in multibyte encoding to Unicode putting up to
@a outLen characters into the buffer @e out. @a outLen characters into the buffer @e out.
If @a out is @NULL, only the length of the string which would result If @a out is @NULL, only the length of the string which would result

View File

@@ -589,7 +589,7 @@ public:
/** /**
Reads the specified amount of bytes and stores the data in buffer. Reads the specified amount of bytes and stores the data in buffer.
To check if the call was successfull you must use LastRead() to check To check if the call was successful you must use LastRead() to check
if this call did actually read @a size bytes (if it didn't, GetLastError() if this call did actually read @a size bytes (if it didn't, GetLastError()
should return a meaningful value). should return a meaningful value).

View File

@@ -46,7 +46,7 @@
@flag{no-maskblt} @flag{no-maskblt}
1 to never use WIN32's MaskBlt function, 0 to allow it to be used where possible. 1 to never use WIN32's MaskBlt function, 0 to allow it to be used where possible.
Default: 0. In some circumstances the MaskBlt function can be slower than using Default: 0. In some circumstances the MaskBlt function can be slower than using
the fallback code, especially if using DC cacheing. By default, MaskBlt will be the fallback code, especially if using DC caching. By default, MaskBlt will be
used where it is implemented by the operating system and driver. used where it is implemented by the operating system and driver.
@flag{msw.remap} @flag{msw.remap}
If 1 (the default), wxToolBar bitmap colours will be remapped to the current If 1 (the default), wxToolBar bitmap colours will be remapped to the current
@@ -117,7 +117,7 @@
Also known as wxWINDOW_DEFAULT_VARIANT. Also known as wxWINDOW_DEFAULT_VARIANT.
@flag{mac.listctrl.always_use_generic} @flag{mac.listctrl.always_use_generic}
Tells wxListCtrl to use the generic control even when it is capable of Tells wxListCtrl to use the generic control even when it is capable of
using the native control instead. Also knwon as wxMAC_ALWAYS_USE_GENERIC_LISTCTRL. using the native control instead. Also known as wxMAC_ALWAYS_USE_GENERIC_LISTCTRL.
@flag{mac.textcontrol-use-spell-checker} @flag{mac.textcontrol-use-spell-checker}
This option only has effect for Mac OS X 10.4 and higher. This option only has effect for Mac OS X 10.4 and higher.
If 1 activates the spell checking in wxTextCtrl. If 1 activates the spell checking in wxTextCtrl.

View File

@@ -796,7 +796,7 @@ public:
void SetTabs(const wxArrayInt& tabs); void SetTabs(const wxArrayInt& tabs);
/** /**
Sets the text foreground colout. Sets the text foreground colour.
*/ */
void SetTextColour(const wxColour& colText); void SetTextColour(const wxColour& colText);

View File

@@ -445,7 +445,7 @@ public:
@param alpha @param alpha
Determines how opaque or transparent the window will be, if the Determines how opaque or transparent the window will be, if the
platform supports the opreration. A value of 0 sets the window to be platform supports the operation. A value of 0 sets the window to be
fully transparent, and a value of 255 sets the window to be fully fully transparent, and a value of 255 sets the window to be fully
opaque. opaque.
*/ */

View File

@@ -15,7 +15,7 @@
wxTreeItemId handles, which may be tested for validity by calling wxTreeItemId handles, which may be tested for validity by calling
wxTreeItemId::IsOk(). wxTreeItemId::IsOk().
A similar control with a fully native implemtation for GTK+ and OS X A similar control with a fully native implementation for GTK+ and OS X
as well is wxDataViewTreeCtrl. as well is wxDataViewTreeCtrl.
To intercept events from a tree control, use the event table macros To intercept events from a tree control, use the event table macros

View File

@@ -94,7 +94,7 @@ public:
y start coordinate, in screen coordinates. y start coordinate, in screen coordinates.
@param x2 @param x2
x desintation coordinate, in screen coordinates. x destination coordinate, in screen coordinates.
@param y2 @param y2
y destination coordinate, in screen coordinates. y destination coordinate, in screen coordinates.

View File

@@ -14,7 +14,7 @@
each character is stored using a 32-bit value. This is different from each character is stored using a 32-bit value. This is different from
wxString which may store a character either as a UTF-8 or as a UTF-16 wxString which may store a character either as a UTF-8 or as a UTF-16
sequence and different from @c std::string which stores a string sequence and different from @c std::string which stores a string
as a squence of simple 8-bit charactesr and also different from as a sequence of simple 8-bit characters and also different from
@c std::wstring which stores the string differently depending on @c std::wstring which stores the string differently depending on
the definition of wchar_t. the definition of wchar_t.
@@ -151,35 +151,35 @@ public:
/** /**
Assigment from a 7-bit ASCII string literal Assignment from a 7-bit ASCII string literal
*/ */
wxUString &assignFromAscii( const char *str ); wxUString &assignFromAscii( const char *str );
/** /**
Assigment from a 7-bit ASCII string literal Assignment from a 7-bit ASCII string literal
*/ */
wxUString &assignFromAscii( const char *str, size_t n ); wxUString &assignFromAscii( const char *str, size_t n );
/** /**
Assigment from a UTF-8 string literal Assignment from a UTF-8 string literal
*/ */
wxUString &assignFromUTF8( const char *str ); wxUString &assignFromUTF8( const char *str );
/** /**
Assigment from a UTF-8 string literal Assignment from a UTF-8 string literal
*/ */
wxUString &assignFromUTF8( const char *str, size_t n ); wxUString &assignFromUTF8( const char *str, size_t n );
/** /**
Assigment from a UTF-16 string literal Assignment from a UTF-16 string literal
*/ */
wxUString &assignFromUTF16( const wxChar16* str ); wxUString &assignFromUTF16( const wxChar16* str );
/** /**
Assigment from a UTF-16 string literal Assignment from a UTF-16 string literal
*/ */
wxUString &assignFromUTF16( const wxChar16* str, size_t n ); wxUString &assignFromUTF16( const wxChar16* str, size_t n );
/** /**
Assigment from a C string literal using wxConvLibc Assignment from a C string literal using wxConvLibc
*/ */
wxUString &assignFromCString( const char* str ); wxUString &assignFromCString( const char* str );
/** /**
Assigment from a C string literal using @a conv Assignment from a C string literal using @a conv
*/ */
wxUString &assignFromCString( const char* str, const wxMBConv &conv ); wxUString &assignFromCString( const char* str, const wxMBConv &conv );

View File

@@ -711,7 +711,7 @@ wxString wxGetOsDescription();
'uname -r' command); e.g. "2" and "6" if the machine is using kernel 2.6.19. 'uname -r' command); e.g. "2" and "6" if the machine is using kernel 2.6.19.
For Mac OS X systems (@c wxOS_MAC) the major and minor version integers are the For Mac OS X systems (@c wxOS_MAC) the major and minor version integers are the
natural version numbers associated with the OS; e.g. "10" and and "6" if the machine natural version numbers associated with the OS; e.g. "10" and "6" if the machine
is using Mac OS X Snow Leopard. is using Mac OS X Snow Leopard.
For Windows-like systems (@c wxOS_WINDOWS) the major and minor version integers will For Windows-like systems (@c wxOS_WINDOWS) the major and minor version integers will

View File

@@ -77,7 +77,7 @@ public:
wxVector(size_type size, const value_type& value); wxVector(size_type size, const value_type& value);
/** /**
Copy onstructor. Copy constructor.
*/ */
wxVector(const wxVector<T>& c); wxVector(const wxVector<T>& c);

View File

@@ -715,7 +715,7 @@ public:
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
/** /**
Same as the non-default constuctor, but returns a status code: @true if Same as the non-default constructor, but returns a status code: @true if
ok, @false if the window couldn't be created. ok, @false if the window couldn't be created.
Just as with the constructor, the @c wxVSCROLL style is always used, Just as with the constructor, the @c wxVSCROLL style is always used,
@@ -791,7 +791,7 @@ public:
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
/** /**
Same as the non-default constuctor, but returns a status code: @true if Same as the non-default constructor, but returns a status code: @true if
ok, @false if the window couldn't be created. ok, @false if the window couldn't be created.
Just as with the constructor, the @c wxHSCROLL style is always used, Just as with the constructor, the @c wxHSCROLL style is always used,
@@ -868,7 +868,7 @@ public:
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
/** /**
Same as the non-default constuctor, but returns a status code: @true if Same as the non-default constructor, but returns a status code: @true if
ok, @false if the window couldn't be created. ok, @false if the window couldn't be created.
Just as with the constructor, the @c wxHSCROLL and @c wxVSCROLL styles Just as with the constructor, the @c wxHSCROLL and @c wxVSCROLL styles

View File

@@ -491,7 +491,7 @@ public:
*/ */
wxWindow* GetPrevSibling() const; wxWindow* GetPrevSibling() const;
/** /**
Reparents the window, i.e the window will be removed from its Reparents the window, i.e. the window will be removed from its
current parent window (e.g. a non-standard toolbar in a wxFrame) current parent window (e.g. a non-standard toolbar in a wxFrame)
and then re-inserted into another. and then re-inserted into another.
@@ -2083,7 +2083,7 @@ public:
/** /**
Sets the style of the window. Please note that some styles cannot be changed Sets the style of the window. Please note that some styles cannot be changed
after the window creation and that Refresh() might need to be be called after the window creation and that Refresh() might need to be called
after changing the others for the change to take place immediately. after changing the others for the change to take place immediately.
See @ref overview_windowstyles "Window styles" for more information about flags. See @ref overview_windowstyles "Window styles" for more information about flags.
@@ -2787,7 +2787,7 @@ public:
/** /**
@name Constraints, sizers and window layouting functions @name Constraints, sizers and window layout functions
*/ */
//@{ //@{
@@ -2830,7 +2830,7 @@ public:
This method calls SetSizer() and then wxSizer::SetSizeHints which sets the initial This method calls SetSizer() and then wxSizer::SetSizeHints which sets the initial
window size to the size needed to accommodate all sizer elements and sets the window size to the size needed to accommodate all sizer elements and sets the
size hints which, if this window is a top level one, prevent the user from size hints which, if this window is a top level one, prevent the user from
resizing it to be less than this minimial size. resizing it to be less than this minimal size.
*/ */
void SetSizerAndFit(wxSizer* sizer, bool deleteOld = true); void SetSizerAndFit(wxSizer* sizer, bool deleteOld = true);

View File

@@ -495,7 +495,7 @@ public:
Also, the wizard will never be smaller than the default size. Also, the wizard will never be smaller than the default size.
The recommended way to use this function is to lay out all wizard pages The recommended way to use this function is to lay out all wizard pages
using the sizers (even though the wizard is not resizeable) and then use using the sizers (even though the wizard is not resizable) and then use
wxSizer::CalcMin() in a loop to calculate the maximum of minimal sizes of wxSizer::CalcMin() in a loop to calculate the maximum of minimal sizes of
the pages and pass it to SetPageSize(). the pages and pass it to SetPageSize().
*/ */

View File

@@ -1177,7 +1177,7 @@ void DnDFrame::OnHelp(wxCommandEvent& /* event */)
wxT("it to wordpad or any other droptarget accepting text (and of course you can just drag it\n") wxT("it to wordpad or any other droptarget accepting text (and of course you can just drag it\n")
wxT("to the right pane). Due to a lot of trace messages, the cursor might take some time to \n") wxT("to the right pane). Due to a lot of trace messages, the cursor might take some time to \n")
wxT("change, don't release the mouse button until it does. You can change the string being\n") wxT("change, don't release the mouse button until it does. You can change the string being\n")
wxT("dragged in in \"File|Test drag...\" dialog.\n") wxT("dragged in \"File|Test drag...\" dialog.\n")
wxT("\n") wxT("\n")
wxT("\n") wxT("\n")
wxT("Please send all questions/bug reports/suggestions &c to \n") wxT("Please send all questions/bug reports/suggestions &c to \n")

View File

@@ -471,7 +471,7 @@ GridFrame::GridFrame()
grid->SetCellAlignment(7, 1, wxALIGN_CENTRE, wxALIGN_CENTRE); grid->SetCellAlignment(7, 1, wxALIGN_CENTRE, wxALIGN_CENTRE);
grid->SetCellValue(7, 1, wxT("Big box!")); grid->SetCellValue(7, 1, wxT("Big box!"));
// create a separator-like row: it's grey and it's non-resizeable // create a separator-like row: it's grey and it's non-resizable
grid->DisableRowResize(10); grid->DisableRowResize(10);
grid->SetRowSize(10, 30); grid->SetRowSize(10, 30);
attr = new wxGridCellAttr; attr = new wxGridCellAttr;

View File

@@ -47,8 +47,8 @@
#define USE_CONTEXT_MENU 1 #define USE_CONTEXT_MENU 1
#endif #endif
// this sample is usefull when new port is developed // this sample is useful when a new port is developed
// and usually new port has majority of flags turned off // and usually a new port has majority of flags turned off
#if wxUSE_LOG && wxUSE_TEXTCTRL #if wxUSE_LOG && wxUSE_TEXTCTRL
#define USE_LOG_WINDOW 1 #define USE_LOG_WINDOW 1
#else #else

View File

@@ -1392,7 +1392,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
s = wxString::Format(wxT("%i tests failed!!!"), failures); s = wxString::Format(wxT("%i tests failed!!!"), failures);
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
else else
s = wxString::Format(wxT("All tests were successfull, but there were %i warnings!"), wxPGGlobalVars->m_warnings); s = wxString::Format(wxT("All tests were successful, but there were %i warnings!"), wxPGGlobalVars->m_warnings);
#endif #endif
RT_MSG(s) RT_MSG(s)
for ( i=0; i<errorMessages.size(); i++ ) for ( i=0; i<errorMessages.size(); i++ )

View File

@@ -112,7 +112,7 @@ protected:
// the controls // the controls
// ------------ // ------------
// the contols to choose the checkbox style // the controls to choose the checkbox style
wxCheckBox *m_chkRight; wxCheckBox *m_chkRight;
wxRadioBox *m_radioKind; wxRadioBox *m_radioKind;

View File

@@ -28,7 +28,7 @@
class MyResizableListCtrl : public wxListCtrl class MyResizableListCtrl : public wxListCtrl
{ {
// Very helpful wxWidgets macro required for wxWidgets-RTTI tracing: By using this // Very helpful wxWidgets macro required for wxWidgets-RTTI tracing: By using this
// you will see "Leaked one object of type myResizeableListCtrl" in the debug log, // you will see "Leaked one object of type myResizableListCtrl" in the debug log,
// along with which line you if was created, but you forget to free the memory. // along with which line you if was created, but you forget to free the memory.
// NOTE: Using this REQUIRES a default constructor: that means either: giving a // NOTE: Using this REQUIRES a default constructor: that means either: giving a
// default value for all parameters in your constructor, or else having a dummy // default value for all parameters in your constructor, or else having a dummy
@@ -60,7 +60,7 @@ public:
const wxString &name = wxT("myResizableListCtrl") const wxString &name = wxT("myResizableListCtrl")
); );
// Destuctor. // Destructor.
~MyResizableListCtrl(){}; ~MyResizableListCtrl(){};
protected: protected:

View File

@@ -354,7 +354,7 @@ static int sg_cApplicationWillUpdate = 0;
before the run loop waits and send the idle events from there. before the run loop waits and send the idle events from there.
It also has the desirable effect of only sending the wx idle events when It also has the desirable effect of only sending the wx idle events when
the event loop is actualy going to block. If the event loop is being the event loop is actually going to block. If the event loop is being
pumped manualy (e.g. like a PeekMessage) then the kCFRunLoopBeforeWaiting pumped manualy (e.g. like a PeekMessage) then the kCFRunLoopBeforeWaiting
observer never fires. Our Yield() method depends on this because sending observer never fires. Our Yield() method depends on this because sending
idle events from within Yield would be bad. idle events from within Yield would be bad.

Some files were not shown because too many files have changed in this diff Show More