cleanup in toplevel activation, and switching to native carbon event notification...

[wxWidgets.git] / src / mac / carbon / statlmac.cpp

diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp
index f5802a2095e2bf0bbabfd343263cfc0270396ac8..938aae0715c45d04e87f5557169a584ae3dcf808 100644 (file)
--- a/src/mac/carbon/statlmac.cpp
+++ b/src/mac/carbon/statlmac.cpp
@@ -30,7 +30,7 @@
 #include "wx/statline.h"
 #include "wx/statbox.h"
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 // ============================================================================
 // implementation
@@ -49,15 +49,17 @@ bool wxStaticLine::Create( wxWindow *parent,
                            long style,
                            const wxString &name)
 {
-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
-               kControlSeparatorLineProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
+    m_macIsUserPane = FALSE ;
+    
+    if ( !wxStaticLineBase::Create(parent, id, pos, size,
+                                   style, wxDefaultValidator, name) )
+        return false;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1, 
+          kControlSeparatorLineProc , (long) this ) ;
+    
+    MacPostControlCreate(pos,size) ;
 
     return TRUE;
 }