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

Disable CLIP_SIBLINGS style.

Browse Source 
Fixes for getting best size.
Fixed some error in flag processing.    All according to patch #1523304.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-07-16 21:26:04 +00:00
parent 9ff1e31960
commit 2fbb8fbbed
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/os2/combobox.cpp
View File

@@ -129,8 +129,9 @@ bool wxComboBox::Create(
lSstyle = WS_TABSTOP |
WS_VISIBLE;
if (lStyle & wxCLIP_SIBLINGS )
lSstyle |= WS_CLIPSIBLINGS;
// clipping siblings does not yet work
// if (lStyle & wxCLIP_SIBLINGS )
// lSstyle |= WS_CLIPSIBLINGS;
if (lStyle & wxCB_READONLY)
lSstyle |= CBS_DROPDOWNLIST;
else if (lStyle & wxCB_SIMPLE)
@@ -163,10 +164,10 @@ bool wxComboBox::Create(
// 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));
int nEditHeight;
wxGetCharSize( GetHWND(), NULL, &nEditHeight, &vFont );
nEditHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nEditHeight);
SetBestFittingSize(wxSize(-1,nEditHeight+4)); // +2x2 for the border
if (!rsValue.empty())
{
@@ -388,7 +389,7 @@ bool wxComboBox::ProcessEditMsg(
return(HandleKillFocus((WXHWND)(HWND)wParam));
}
return false;
} // end of WinGuiBase_CComboBox::ProcessEditMsg
} // end of wxComboBox::ProcessEditMsg
MRESULT EXPENTRY wxComboEditWndProc(
HWND hWnd