Lots of fixes for scrolling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -67,15 +67,6 @@ bool wxStaticText::Create(
|
||||
lSstyle |= DT_RIGHT;
|
||||
else
|
||||
lSstyle |= DT_LEFT;
|
||||
//
|
||||
// If the parent is a scrolled window the controls must
|
||||
// have this style or they will overlap the scrollbars
|
||||
//
|
||||
if (pParent)
|
||||
if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)) ||
|
||||
pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)))
|
||||
lSstyle |= WS_CLIPSIBLINGS;
|
||||
|
||||
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
|
||||
,WC_STATIC // Window class
|
||||
,(PSZ)rsLabel.c_str() // Initial Text
|
||||
@@ -110,12 +101,18 @@ bool wxStaticText::Create(
|
||||
);
|
||||
|
||||
SubclassWin(m_hWnd);
|
||||
wxControl::SetFont(*wxSMALL_FONT);
|
||||
wxFont* pTextFont = new wxFont( 10
|
||||
,wxMODERN
|
||||
,wxNORMAL
|
||||
,wxNORMAL
|
||||
);
|
||||
wxControl::SetFont(*pTextFont);
|
||||
SetSize( nX
|
||||
,nY
|
||||
,nWidth
|
||||
,nHeight
|
||||
);
|
||||
delete pTextFont;
|
||||
return TRUE;
|
||||
} // end of wxStaticText::Create
|
||||
|
||||
|
Reference in New Issue
Block a user