Update makefile and module def for new dynlib stuff. Also some control colouring stuff for OS/2 controls to better mesh with Panel backgrounds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -91,6 +91,13 @@ bool wxStaticText::Create(
|
||||
,sizeof(LONG)
|
||||
,(PVOID)&lColor
|
||||
);
|
||||
lColor = (LONG)m_backgroundColour.GetPixel();
|
||||
|
||||
::WinSetPresParam( m_hWnd
|
||||
,PP_BACKGROUNDCOLOR
|
||||
,sizeof(LONG)
|
||||
,(PVOID)&lColor
|
||||
);
|
||||
|
||||
SubclassWin(m_hWnd);
|
||||
wxControl::SetFont(pParent->GetFont());
|
||||
@@ -159,6 +166,27 @@ wxSize wxStaticText::DoGetBestSize() const
|
||||
);
|
||||
} // end of wxStaticText::DoGetBestSize
|
||||
|
||||
void wxStaticText::DoSetSize(
|
||||
int nX
|
||||
, int nY
|
||||
, int nWidth
|
||||
, int nHeight
|
||||
, int nSizeFlags
|
||||
)
|
||||
{
|
||||
//
|
||||
// We need to refresh the window after changing its size as the standard
|
||||
// control doesn't always update itself properly.
|
||||
//
|
||||
wxStaticTextBase::DoSetSize( nX
|
||||
,nY
|
||||
,nWidth
|
||||
,nHeight
|
||||
,nSizeFlags
|
||||
);
|
||||
Refresh();
|
||||
} // end of wxStaticText::DoSetSize
|
||||
|
||||
bool wxStaticText::SetFont(
|
||||
const wxFont& rFont
|
||||
)
|
||||
|
Reference in New Issue
Block a user