AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Spiner -> Spinner

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2005-02-06 11:27:19 +00:00
parent 19d360adbe
commit 5aaabb3710
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/control.h
View File

@ -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

2
src/msw/control.cpp
View File

@ -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(

2
src/msw/spinbutt.cpp
View File

@ -206,7 +206,7 @@ wxSpinButton::~wxSpinButton()
wxSize wxSpinButton::DoGetBestSize() const
{
return GetBestSpinerSize( (GetWindowStyle() & wxSP_VERTICAL) != 0 );
return GetBestSpinnerSize( (GetWindowStyle() & wxSP_VERTICAL) != 0 );
}
// ----------------------------------------------------------------------------

6
src/msw/wince/choicece.cpp
View File

@ -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 )
{

4
src/msw/wince/textctrlce.cpp
View File

@ -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 )
{