From a0d9c6cb9112174b71970686a95b628819797b87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Sat, 4 Sep 2004 01:26:40 +0000 Subject: [PATCH] Spelling fixes [#1017001], source cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demos/dbbrowse/dbbrowse.cpp | 2 +- include/wx/event.h | 42 ++++++++++++++++++------------------ include/wx/window.h | 34 ++++++++++++++--------------- samples/db/listdb.cpp | 2 +- samples/richedit/wxllist.cpp | 2 +- samples/richedit/wxllist.h | 2 +- samples/widgets/slider.cpp | 4 ++-- src/msw/dcclient.cpp | 2 +- 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/demos/dbbrowse/dbbrowse.cpp b/demos/dbbrowse/dbbrowse.cpp index 28eafd9a98..8460f30e3d 100644 --- a/demos/dbbrowse/dbbrowse.cpp +++ b/demos/dbbrowse/dbbrowse.cpp @@ -185,7 +185,7 @@ bool MainApp::OnInit(void) // Does everything needed for a program start Temp0.Printf(_T("%s - %s"),GetAppName().c_str(),GetVendorName().c_str()); frame = new MainFrame((wxFrame *) NULL,(wxChar *) Temp0.c_str(),wxPoint(x,y),wxSize(w,h)); //--------------------------------------------------------------------------------------- - // Set the Backgroundcolour (only need if your are NOT using wxSYS_COLOUR_BACKGROUND) + // Set the Backgroundcolour (only needed if you are NOT using wxSYS_COLOUR_BACKGROUND) frame->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BACKGROUND)); // frame->SetBackgroundColour(wxColour(255, 255, 255)); // frame->SetBackgroundColour(* wxWHITE); diff --git a/include/wx/event.h b/include/wx/event.h index 5ce6242d57..538f13e9ab 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -349,8 +349,8 @@ public: // Can instruct event processor that we wish to ignore this event // (treat as if the event table entry had not been found): this must be done // to allow the event processing by the base classes (calling event.Skip() - // is the analog of calling the base class verstion of a virtual function) - void Skip(bool skip = TRUE) { m_skipped = skip; } + // is the analog of calling the base class version of a virtual function) + void Skip(bool skip = true) { m_skipped = skip; } bool GetSkipped() const { return m_skipped; }; // this function is used to create a copy of the event polymorphically and @@ -510,7 +510,7 @@ public: // Get checkbox value bool IsChecked() const { return m_commandInt != 0; } - // TRUE if the listbox event was a selection. + // true if the listbox event was a selection. bool IsSelection() const { return (m_extraLong != 0); } void SetExtraLong(long extraLong) { m_extraLong = extraLong; } @@ -539,17 +539,17 @@ class WXDLLIMPEXP_CORE wxNotifyEvent : public wxCommandEvent public: wxNotifyEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) : wxCommandEvent(commandType, winid) - { m_bAllow = TRUE; } + { m_bAllow = true; } wxNotifyEvent(const wxNotifyEvent& event) : wxCommandEvent(event) { m_bAllow = event.m_bAllow; } // veto the operation (usually it's allowed by default) - void Veto() { m_bAllow = FALSE; } + void Veto() { m_bAllow = false; } // allow the operation if it was disabled by default - void Allow() { m_bAllow = TRUE; } + void Allow() { m_bAllow = true; } // for implementation code only: is the operation allowed? bool IsAllowed() const { return m_bAllow; } @@ -1199,7 +1199,7 @@ private: class WXDLLIMPEXP_CORE wxActivateEvent : public wxEvent { public: - wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = TRUE, int Id = 0) + wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = true, int Id = 0) : wxEvent(Id, type) { m_active = active; } wxActivateEvent(const wxActivateEvent& event) @@ -1282,9 +1282,9 @@ class WXDLLIMPEXP_CORE wxCloseEvent : public wxEvent public: wxCloseEvent(wxEventType type = wxEVT_NULL, int winid = 0) : wxEvent(winid, type), - m_loggingOff(TRUE), - m_veto(FALSE), // should be FALSE by default - m_canVeto(TRUE) {} + m_loggingOff(true), + m_veto(false), // should be false by default + m_canVeto(true) {} wxCloseEvent(const wxCloseEvent & event) : wxEvent(event), @@ -1295,9 +1295,9 @@ public: void SetLoggingOff(bool logOff) { m_loggingOff = logOff; } bool GetLoggingOff() const { return m_loggingOff; } - void Veto(bool veto = TRUE) + void Veto(bool veto = true) { - // GetVeto() will return FALSE anyhow... + // GetVeto() will return false anyhow... wxCHECK_RET( m_canVeto, wxT("call to Veto() ignored (can't veto this event)") ); @@ -1326,7 +1326,7 @@ private: class WXDLLIMPEXP_CORE wxShowEvent : public wxEvent { public: - wxShowEvent(int winid = 0, bool show = FALSE) + wxShowEvent(int winid = 0, bool show = false) : wxEvent(winid, wxEVT_SHOW) { m_show = show; } wxShowEvent(const wxShowEvent & event) @@ -1352,7 +1352,7 @@ private: class WXDLLIMPEXP_CORE wxIconizeEvent : public wxEvent { public: - wxIconizeEvent(int winid = 0, bool iconized = TRUE) + wxIconizeEvent(int winid = 0, bool iconized = true) : wxEvent(winid, wxEVT_ICONIZE) { m_iconized = iconized; } wxIconizeEvent(const wxIconizeEvent & event) @@ -1564,7 +1564,7 @@ public: m_enabled = m_setEnabled = m_setText = - m_setChecked = FALSE; + m_setChecked = false; } wxUpdateUIEvent(const wxUpdateUIEvent & event) : wxCommandEvent(event), @@ -1583,9 +1583,9 @@ public: bool GetSetChecked() const { return m_setChecked; } bool GetSetEnabled() const { return m_setEnabled; } - void Check(bool check) { m_checked = check; m_setChecked = TRUE; } - void Enable(bool enable) { m_enabled = enable; m_setEnabled = TRUE; } - void SetText(const wxString& text) { m_text = text; m_setText = TRUE; } + void Check(bool check) { m_checked = check; m_setChecked = true; } + void Enable(bool enable) { m_enabled = enable; m_setEnabled = true; } + void SetText(const wxString& text) { m_text = text; m_setText = true; } // Sets the interval between updates in milliseconds. // Set to -1 to disable updates, or to 0 to update as frequently as possible. @@ -1730,7 +1730,7 @@ class WXDLLIMPEXP_CORE wxQueryNewPaletteEvent : public wxEvent public: wxQueryNewPaletteEvent(wxWindowID winid = 0) : wxEvent(winid, wxEVT_QUERY_NEW_PALETTE), - m_paletteRealized(FALSE) + m_paletteRealized(false) { } wxQueryNewPaletteEvent(const wxQueryNewPaletteEvent & event) : wxEvent(event), @@ -1949,14 +1949,14 @@ class WXDLLIMPEXP_CORE wxIdleEvent : public wxEvent public: wxIdleEvent() : wxEvent(0, wxEVT_IDLE), - m_requestMore(FALSE) + m_requestMore(false) { } wxIdleEvent(const wxIdleEvent & event) : wxEvent(event), m_requestMore(event.m_requestMore) { } - void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; } + void RequestMore(bool needMore = true) { m_requestMore = needMore; } bool MoreRequested() const { return m_requestMore; } virtual wxEvent *Clone() const { return new wxIdleEvent(*this); } diff --git a/include/wx/window.h b/include/wx/window.h index a407cbbb04..3a0b1e7d52 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -193,7 +193,7 @@ public: // window id uniquely identifies the window among its siblings unless - // it is -1 which means "don't care" + // it is wxID_ANY which means "don't care" void SetId( wxWindowID winid ) { m_windowId = winid; } wxWindowID GetId() const { return m_windowId; } @@ -216,7 +216,7 @@ public: { DoSetSize(x, y, width, height, sizeFlags); } void SetSize( int width, int height ) - { DoSetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); } + { DoSetSize( wxDefaultCoord, wxDefaultCoord, width, height, wxSIZE_USE_EXISTING ); } void SetSize( const wxSize& size ) { SetSize( size.x, size.y); } @@ -225,7 +225,7 @@ public: { DoSetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); } void Move(int x, int y, int flags = wxSIZE_USE_EXISTING) - { DoSetSize(x, y, -1, -1, flags); } + { DoSetSize(x, y, wxDefaultCoord, wxDefaultCoord, flags); } void Move(const wxPoint& pt, int flags = wxSIZE_USE_EXISTING) { Move(pt.x, pt.y, flags); } @@ -316,7 +316,7 @@ public: void InvalidateBestSize() { m_bestSizeCache = wxDefaultSize; } void CacheBestSize(const wxSize& size) const { wxConstCast(this, wxWindowBase)->m_bestSizeCache = size; } - + // There are times (and windows) where 'Best' size and 'Min' size // are vastly out of sync. This should be remedied somehow, but in // the meantime, this method will return the larger of BestSize @@ -332,7 +332,7 @@ public: // minimum size, giving priority to the min size components, and // returns the results. wxSize GetBestFittingSize() const; - + // A 'Smart' SetSize that will fill in default size values with 'best' // size. Sets the minsize to what was passed in. void SetBestFittingSize(const wxSize& size=wxDefaultSize); @@ -359,8 +359,8 @@ public: // set min/max size of the window virtual void SetSizeHints( int minW, int minH, - int maxW = -1, int maxH = -1, - int incW = -1, int incH = -1 ); + int maxW = wxDefaultCoord, int maxH = wxDefaultCoord, + int incW = wxDefaultCoord, int incH = wxDefaultCoord ); void SetSizeHints( const wxSize& minSize, const wxSize& maxSize=wxDefaultSize, const wxSize& incSize=wxDefaultSize) @@ -371,7 +371,7 @@ public: } virtual void SetVirtualSizeHints( int minW, int minH, - int maxW = -1, int maxH = -1 ); + int maxW = wxDefaultCoord, int maxH = wxDefaultCoord ); void SetVirtualSizeHints( const wxSize& minSize, const wxSize& maxSize=wxDefaultSize) { @@ -389,7 +389,7 @@ public: void SetMinSize(const wxSize& minSize) { SetSizeHints(minSize); } void SetMaxSize(const wxSize& maxSize) { SetSizeHints(GetMinSize(), maxSize); } - + // Methods for accessing the virtual size of a window. For most // windows this is just the client area of the window, but for // some like scrolled windows it is more or less independent of @@ -472,7 +472,7 @@ public: // Returns true if this class should have the background colour // changed to match the parent window's theme. For example when a - // page is added to a notebook it and it's children may need to have + // page is added to a notebook it and its children may need to have // the colours adjusted depending on the current theme settings, but // not all windows/controls can do this without looking wrong. virtual void ApplyParentThemeBackground(const wxColour& WXUNUSED(bg)) @@ -1065,7 +1065,7 @@ protected: void SendDestroyEvent(); // the window id - a number which uniquely identifies a window among - // its siblings unless it is -1 + // its siblings unless it is wxID_ANY wxWindowID m_windowId; // the parent window of this window (or NULL) and the list of the children @@ -1074,7 +1074,7 @@ protected: wxWindowList m_children; // the minimal allowed size for the window (no minimal size if variable(s) - // contain(s) -1) + // contain(s) wxDefaultCoord) int m_minWidth, m_minHeight, m_maxWidth, @@ -1144,7 +1144,7 @@ protected: bool m_hasBgCol:1; bool m_hasFgCol:1; bool m_hasFont:1; - + // and should it be inherited by children? bool m_inheritBgCol:1; bool m_inheritFgCol:1; @@ -1181,8 +1181,8 @@ protected: // Get the default size for the new window if no explicit size given. TLWs // have their own default size so this is just for non top-level windows. - static int WidthDefault(int w) { return w == -1 ? 20 : w; } - static int HeightDefault(int h) { return h == -1 ? 20 : h; } + static int WidthDefault(int w) { return w == wxDefaultCoord ? 20 : w; } + static int HeightDefault(int h) { return h == wxDefaultCoord ? 20 : h; } // Used to save the results of DoGetBestSize so it doesn't need to be @@ -1192,7 +1192,7 @@ protected: // keep the old name for compatibility, at least until all the internal // usages of it are changed to SetBestFittingSize void SetBestSize(const wxSize& size) { SetBestFittingSize(size); } - + // set the initial window size if none is given (i.e. at least one of the // components of the size passed to ctor/Create() is -1) // @@ -1202,7 +1202,7 @@ protected: // can be accurately calculated virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) {} - + // more pure virtual functions // --------------------------- diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp index 0801df5c87..8238f181b4 100644 --- a/samples/db/listdb.cpp +++ b/samples/db/listdb.cpp @@ -257,7 +257,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, wxChar *windowTitle, wxChar *tableName, // necessary if joins are involved since by default both columns must come from the // same table. // -// If you do query by sql statement, you must pass in the maximum lenght of column1, +// If you do query by sql statement, you must pass in the maximum length of column1, // since it cannot be derived when you query using your own sql statement. // // The optional database connection can be used if you'd like the lookup class diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp index 8758ac8dca..51ba0553e8 100644 --- a/samples/richedit/wxllist.cpp +++ b/samples/richedit/wxllist.cpp @@ -1100,7 +1100,7 @@ wxLayoutLine::Draw(wxDC &dc, pos.y += m_BaseLine; - CoordType xpos = 0; // cursorpos, lenght of line + CoordType xpos = 0; // cursorpos, length of line CoordType from, to; diff --git a/samples/richedit/wxllist.h b/samples/richedit/wxllist.h index ff7990cbc0..d62a236737 100644 --- a/samples/richedit/wxllist.h +++ b/samples/richedit/wxllist.h @@ -650,7 +650,7 @@ public: inline CoordType GetLineNumber() const { return m_LineNumber; } /** Return the length of the line. - @return line lenght in cursor positions + @return line length in cursor positions */ inline CoordType GetLength() const { return m_Length; } //@} diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp index 21ea9e1ff2..3dec8c559c 100644 --- a/samples/widgets/slider.cpp +++ b/samples/widgets/slider.cpp @@ -288,7 +288,7 @@ SliderWidgetsPage::SliderWidgetsPage(wxNotebook *notebook, sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(SliderPage_SetThumbLen, - _T("Thumb &lenght"), + _T("Thumb &length"), SliderPage_ThumbLenText, &m_textThumbLen); @@ -438,7 +438,7 @@ void SliderWidgetsPage::DoSetThumbLen() long len; if ( !m_textThumbLen->GetValue().ToLong(&len) ) { - wxLogWarning(_T("Invalid slider thumb lenght")); + wxLogWarning(_T("Invalid slider thumb length")); return; } diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp index d8d6562774..0f8ac84876 100644 --- a/src/msw/dcclient.cpp +++ b/src/msw/dcclient.cpp @@ -75,7 +75,7 @@ static PAINTSTRUCT g_paintStruct; #ifdef __WXDEBUG__ // a global variable which we check to verify that wxPaintDC are only - // created in resopnse to WM_PAINT message - doing this from elsewhere is a + // created in response to WM_PAINT message - doing this from elsewhere is a // common programming error among wxWidgets programmers and might lead to // very subtle and difficult to debug refresh/repaint bugs. int g_isPainting = 0; -- 2.47.2