reverted the change of r56246 and keep the old behaviour of MB2WC/WC2MB; document...

[wxWidgets.git] / src / osx / carbon / window.cpp

diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp
index 2a2db6407cfe57b051ffc97026cc39d931a6f3f8..39ed9fe0bfbbe095167029e5f7390ddf5280cd8d 100644 (file)
--- 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
 //