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

Fixed sizer height and queried text length according to patch #1507207

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-06-18 19:31:07 +00:00
parent 1ebd017e14
commit 21a9132e92
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/os2/choice.cpp
View File

@@ -100,6 +100,14 @@ bool wxChoice::Create(
,rSize.x ,rSize.x
,rSize.y ,rSize.y
); );
// Set height to use with sizers i.e. without the dropdown listbox
wxFont vFont = GetFont();
int nCx,nCy;
wxGetCharSize( GetHWND(), &nCx, &nCy, &vFont );
int nEditHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy);
SetBestFittingSize(wxSize(-1,nEditHeight));
return true; return true;
} // end of wxChoice::Create } // end of wxChoice::Create
@@ -242,7 +250,7 @@ wxString wxChoice::GetString(unsigned int n) const
nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0)); nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0));
if (nLen != LIT_ERROR && nLen > 0) if (nLen != LIT_ERROR && nLen > 0)
{ {
zBuf = new wxChar[nLen + 1]; zBuf = new wxChar[++nLen];
::WinSendMsg( GetHwnd() ::WinSendMsg( GetHwnd()
,LM_QUERYITEMTEXT ,LM_QUERYITEMTEXT
,MPFROM2SHORT((SHORT)n, (SHORT)nLen) ,MPFROM2SHORT((SHORT)n, (SHORT)nLen)