From 08422003083270640e23c2563a5fa72d131add96 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 12 Dec 2004 15:22:49 +0000 Subject: [PATCH] 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 --- include/wx/mac/carbon/window.h | 1 + src/mac/carbon/window.cpp | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h index 5d4f8ccd56..9b5e20c9cb 100644 --- a/include/wx/mac/carbon/window.h +++ b/include/wx/mac/carbon/window.h @@ -181,6 +181,7 @@ public: // the absolute coortinates of this window's root have changed virtual void MacTopLevelWindowChangedPosition() ; + virtual void MacChildAdded() ; virtual void MacVisibilityChanged() ; virtual void MacEnabledStateChanged() ; virtual void MacHiliteChanged() ; diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 8bcc705707..313f6f0b19 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -892,6 +892,19 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, 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) { 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() ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; ::EmbedControl( m_peer->GetControlRef() , container ) ; + GetParent()->MacChildAdded() ; // adjust font, controlsize etc DoSetWindowVariant( m_windowVariant ) ; -- 2.45.2