X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4825ef73a5f190b8f39c59df098c3f39fa4464b..6f8dd114f41f0cfdf3670267e88f7dea1da18f5a:/src/osx/carbon/window.cpp?ds=inline diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp index 2a2db6407c..39ed9fe0bf 100644 --- a/src/osx/carbon/window.cpp +++ b/src/osx/carbon/window.cpp @@ -288,7 +288,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl #endif wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow)); - + // remove this as soon as posting the synthesized event works properly static bool inKillFocusEvent = false ; @@ -849,7 +849,7 @@ void wxMacControl::RemoveFromParent() void wxMacControl::Embed( wxWidgetImpl *parent ) { - HIViewAddSubview(parent->GetWXWidget(), m_controlRef); + HIViewAddSubview((ControlRef)parent->GetWXWidget(), m_controlRef); } void wxMacControl::SetNeedsDisplay( const wxRect* rect ) @@ -1381,13 +1381,6 @@ void wxMacControl::SetScrollThumb( wxInt32 WXUNUSED(pos), wxInt32 WXUNUSED(views // implemented in respective subclass } -void wxMacControl::AddSubWidget( wxWidgetImpl* widget ) -{ - ControlRef container = (ControlRef) GetWXWidget() ; - wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; - ::EmbedControl( (ControlRef) widget->GetWXWidget() , container ) ; -} - // // Tab Control //