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

Lots of OS/2 updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-08-06 03:35:32 +00:00
parent 94640e0414
commit b720b24da8
5 changed files with 195 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/os2/stattext.cpp
View File

@@ -101,18 +101,14 @@ bool wxStaticText::Create(
);
SubclassWin(m_hWnd);
wxFont* pTextFont = new wxFont( 10
,wxMODERN
,wxNORMAL
,wxNORMAL
);
wxControl::SetFont(*pTextFont);
SetFont(*wxSMALL_FONT);
SetXComp(0);
SetYComp(0);
SetSize( nX
,nY
,nWidth
,nHeight
);
delete pTextFont;
return TRUE;
} // end of wxStaticText::Create
@@ -223,9 +219,18 @@ void wxStaticText::SetLabel(
//
if (!(GetWindowStyle() & wxST_NO_AUTORESIZE))
{
DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
wxCoord vX;
wxCoord vY;
wxCoord vWidth;
wxCoord vHeight;
GetPosition(&vX, &vY);
GetSize(&vWidth, &vHeight);
if (!(vX == -1 && vY == -1 && vWidth == -1 && vHeight == -1))
DoSetSize(vX, vY, vWidth, vHeight, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
else
DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
}
DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT);
} // end of wxStaticText::SetLabel
MRESULT wxStaticText::OS2WindowProc(