Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement wxSpinCtrl::GetSizeFromTextSize for wxOSX/Cocoa

Browse Source 
The value is calculated based on size of wxTextCtrl
This commit is contained in:
wangqr
2020-05-19 00:22:01 -04:00
parent dad9a02a40
commit a06fb27f21
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/generic/spinctlg.cpp
View File

@@ -278,6 +278,10 @@ wxSize wxSpinCtrlGenericBase::DoGetBestSize() const
wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const
{ {
#ifdef __WXOSX__
wxSize sizeBtn = m_spinButton->GetBestSize(), sizeText = m_textCtrl->GetSizeFromTextSize(xlen, ylen);
return wxSize(sizeBtn.GetWidth() + sizeText.GetWidth() + MARGIN, wxMax(sizeBtn.GetHeight(), sizeText.GetHeight()));
#else
wxSize sizeBtn = m_spinButton->GetBestSize(); wxSize sizeBtn = m_spinButton->GetBestSize();
wxSize totalS( m_textCtrl->GetBestSize() ); wxSize totalS( m_textCtrl->GetBestSize() );
@@ -293,6 +297,7 @@ wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const
tsize.IncBy(0, ylen - GetCharHeight()); tsize.IncBy(0, ylen - GetCharHeight());
return tsize; return tsize;
#endif
} }
void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height) void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)