fixed crash introduced in v1.41

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

diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp
index 30305cc1cf7d1855524b4c849acf4c13ad218bb1..359893d527e5c1515f6d7e3df7e34377cc256660 100644 (file)
--- a/src/mac/carbon/statlmac.cpp
+++ b/src/mac/carbon/statlmac.cpp
@@ -16,13 +16,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "statline.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_STATLINE
+

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif


@@ -49,15 +47,19 @@ bool wxStaticLine::Create( wxWindow *parent,
                            long style,
                            const wxString &name)
 {
                            long style,
                            const wxString &name)
 {

-    Rect bounds ;
-    Str255 title ;
+    m_macIsUserPane = FALSE ;

     
     

-    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
+    if ( !wxStaticLineBase::Create(parent, id, pos, size,
+                                   style, wxDefaultValidator, name) )
+        return false;

 
 

-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
-          kControlSeparatorLineProc , (long) this ) ;
-    
-    MacPostControlCreate() ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    m_peer = new wxMacControl(this) ;
+    verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, m_peer->GetControlRefAddr() ) ) ;  
+
+    MacPostControlCreate(pos,size) ;

 
     return TRUE;
 }
 
     return TRUE;
 }

+
+#endif //wxUSE_STATLINE