scrolling hack (always move our own scrollbars highest in z-order)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -181,6 +181,7 @@ public:
|
|||||||
// the absolute coortinates of this window's root have changed
|
// the absolute coortinates of this window's root have changed
|
||||||
virtual void MacTopLevelWindowChangedPosition() ;
|
virtual void MacTopLevelWindowChangedPosition() ;
|
||||||
|
|
||||||
|
virtual void MacChildAdded() ;
|
||||||
virtual void MacVisibilityChanged() ;
|
virtual void MacVisibilityChanged() ;
|
||||||
virtual void MacEnabledStateChanged() ;
|
virtual void MacEnabledStateChanged() ;
|
||||||
virtual void MacHiliteChanged() ;
|
virtual void MacHiliteChanged() ;
|
||||||
|
@@ -892,6 +892,19 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxWindowMac::MacChildAdded()
|
||||||
|
{
|
||||||
|
if ( m_vScrollBar )
|
||||||
|
{
|
||||||
|
m_vScrollBar->Raise() ;
|
||||||
|
}
|
||||||
|
if ( m_hScrollBar )
|
||||||
|
{
|
||||||
|
m_hScrollBar->Raise() ;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
|
void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
|
wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
|
||||||
@@ -904,6 +917,7 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
|
|||||||
ControlRef container = (ControlRef) GetParent()->GetHandle() ;
|
ControlRef container = (ControlRef) GetParent()->GetHandle() ;
|
||||||
wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
|
wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
|
||||||
::EmbedControl( m_peer->GetControlRef() , container ) ;
|
::EmbedControl( m_peer->GetControlRef() , container ) ;
|
||||||
|
GetParent()->MacChildAdded() ;
|
||||||
|
|
||||||
// adjust font, controlsize etc
|
// adjust font, controlsize etc
|
||||||
DoSetWindowVariant( m_windowVariant ) ;
|
DoSetWindowVariant( m_windowVariant ) ;
|
||||||
|
Reference in New Issue
Block a user