Implement DoGetSizeFromTextSize() for wxMSW wx{Choice,Combobox,TextCtrl}.

Refactor and improve the existing DoGetBestSize() implementations to use
DoGetBestSize().

Closes #14816.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-14 13:47:59 +00:00
parent df74e2d251
commit aa24f946c6
7 changed files with 88 additions and 16 deletions

View File

@@ -127,6 +127,7 @@ protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
// Show or hide the popup part of the control.
void MSWDoPopupOrDismiss(bool show);

View File

@@ -132,6 +132,8 @@ protected:
virtual void DoSetToolTip(wxToolTip *tip);
#endif
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
// this is the implementation of GetEditHWND() which can also be used when
// we don't have the edit control, it simply returns NULL then
//

View File

@@ -236,6 +236,7 @@ protected:
bool SendUpdateEvent();
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
#if wxUSE_RICHEDIT
// Apply the character-related parts of wxTextAttr to the given selection