Changeset 56218 for wxWidgets/trunk/src/osx/carbon/window.cpp

Timestamp:

10/10/08 12:01:32 (3 months ago)

Author:

SC

Message:

moving embedding to common API

Files:

• wxWidgets/trunk/src/osx/carbon/window.cpp (modified) (2 diffs)

wxWidgets/trunk/src/osx/carbon/window.cpp

@@ -842 +842 @@
 }
 
-void wxMacControl::SetReference( URefCon data )
-{
-    SetControlReference( m_controlRef , data );
-}
-
 void wxMacControl::RemoveFromParent()
 {
     // nothing to do here for carbon
+    HIViewRemoveFromSuperview(m_controlRef);
 }
 
 void wxMacControl::Embed( wxWidgetImpl *parent )
 {
-    // copied from MacPostControlCreate
-    ControlRef container = (ControlRef) parent->GetWXWidget() ;
-    wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
-    ::EmbedControl( m_controlRef , container ) ;
+    HIViewAddSubview(parent->GetWXWidget(), m_controlRef);
 }
 
@@ -1389 +1382 @@
 }
 
+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