From 5aaabb37107a52c9c28438fea8e3f81c12cd759e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 6 Feb 2005 11:27:19 +0000 Subject: [PATCH] Spiner -> Spinner git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/control.h | 2 +- src/msw/control.cpp | 2 +- src/msw/spinbutt.cpp | 2 +- src/msw/wince/choicece.cpp | 6 +++--- src/msw/wince/textctrlce.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 70ce2da88d..d00396b335 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -81,7 +81,7 @@ protected: // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in // WinCE of Smartphones this happens also for native wxTextCtrl, // wxChoice and others. - virtual wxSize GetBestSpinerSize(const bool is_vertical) const; + virtual wxSize GetBestSpinnerSize(const bool is_vertical) const; // create the control of the given Windows class: this is typically called // from Create() method of the derived class passing its label, pos and diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 60d235e05f..caaa395f3c 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -212,7 +212,7 @@ wxSize wxControl::DoGetBestSize() const // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in // WinCE of Smartphones this happens also for native wxTextCtrl, // wxChoice and others. -wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const +wxSize wxControl::GetBestSpinnerSize(const bool is_vertical) const { // take size according to layout wxSize bestSize( diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index 09b3f0acc9..9a8874d88e 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -206,7 +206,7 @@ wxSpinButton::~wxSpinButton() wxSize wxSpinButton::DoGetBestSize() const { - return GetBestSpinerSize( (GetWindowStyle() & wxSP_VERTICAL) != 0 ); + return GetBestSpinnerSize( (GetWindowStyle() & wxSP_VERTICAL) != 0 ); } // ---------------------------------------------------------------------------- diff --git a/src/msw/wince/choicece.cpp b/src/msw/wince/choicece.cpp index 5eafda649c..231b96e90f 100644 --- a/src/msw/wince/choicece.cpp +++ b/src/msw/wince/choicece.cpp @@ -149,7 +149,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent, WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ; wxSize sizeText(size), sizeBtn(size); - sizeBtn.x = GetBestSpinerSize(IsVertical(style)).x; + sizeBtn.x = GetBestSpinnerSize(IsVertical(style)).x; if ( sizeText.x == wxDefaultCoord ) { @@ -478,7 +478,7 @@ wxClientData* wxChoice::DoGetItemClientObject( int n ) const wxSize wxChoice::DoGetBestSize() const { - wxSize sizeBtn = GetBestSpinerSize(IsVertical(GetWindowStyle())); + wxSize sizeBtn = GetBestSpinnerSize(IsVertical(GetWindowStyle())); sizeBtn.x += DEFAULT_ITEM_WIDTH + MARGIN_BETWEEN; int y; @@ -501,7 +501,7 @@ wxSize wxChoice::DoGetBestSize() const void wxChoice::DoMoveWindow(int x, int y, int width, int height) { - int widthBtn = GetBestSpinerSize(IsVertical(GetWindowStyle())).x; + int widthBtn = GetBestSpinnerSize(IsVertical(GetWindowStyle())).x; int widthText = width - widthBtn - MARGIN_BETWEEN; if ( widthText <= 0 ) { diff --git a/src/msw/wince/textctrlce.cpp b/src/msw/wince/textctrlce.cpp index ab94159c46..5f29aa7f81 100644 --- a/src/msw/wince/textctrlce.cpp +++ b/src/msw/wince/textctrlce.cpp @@ -167,7 +167,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id, WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ; wxSize sizeText(size), sizeBtn(size); - sizeBtn.x = GetBestSpinerSize(IsVertical(style)).x / 2; + sizeBtn.x = GetBestSpinnerSize(IsVertical(style)).x / 2; if ( sizeText.x == wxDefaultCoord ) { @@ -1088,7 +1088,7 @@ bool wxTextCtrl::AcceptsFocus() const void wxTextCtrl::DoMoveWindow(int x, int y, int width, int height) { - int widthBtn = GetBestSpinerSize(IsVertical(GetWindowStyle())).x / 2; + int widthBtn = GetBestSpinnerSize(IsVertical(GetWindowStyle())).x / 2; int widthText = width - widthBtn - MARGIN_BETWEEN; if ( widthText <= 0 ) { -- 2.47.2