Fix for non-CG mode

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

diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp
index 52f3d407331cc40daa2fa89eaa99d9acd7821e42..d0102cc8c3b46ed4dc7d1dfdecfbaa3bb4755717 100644 (file)
--- a/src/mac/carbon/statlmac.cpp
+++ b/src/mac/carbon/statlmac.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/statline.cpp
+// Name:        src/mac/carbon/statlmac.cpp

 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99


@@ -16,10 +16,6 @@
 // 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"
 


@@ -27,8 +23,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STATLINE
+

 #include "wx/statline.h"
 #include "wx/statline.h"

-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif
+
+#include "wx/mac/uma.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


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

-    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return FALSE;
+    m_macIsUserPane = false ;

 
 

-    // ok, this is ugly but it's better than nothing: use a thin static box to
-    // emulate static line
+    if ( !wxStaticLineBase::Create(parent, id, pos, size,
+                                   style, wxDefaultValidator, name) )
+        return false;

 
 

-    wxSize sizeReal = AdjustSize(size);
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    m_peer = new wxMacControl(this) ;
+    verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, m_peer->GetControlRefAddr() ) ) ;

 
 

-//    m_statbox = new wxStaticBox(parent, id, wxT(""), pos, sizeReal, style, name);
+    MacPostControlCreate(pos,size) ;

 
 

-    return TRUE;
+    return true;

 }
 }

+
+#endif //wxUSE_STATLINE