Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / osx / statline_osx.cpp

diff --git a/src/osx/statline_osx.cpp b/src/osx/statline_osx.cpp
index edb5b50158cdb9b9627200c1a6b6eb01794b6bee..39522f252c358e6dbd5535a71192ef470a8aeb5b 100644 (file)
--- a/src/osx/statline_osx.cpp
+++ b/src/osx/statline_osx.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/statlmac.cpp
+// Name:        src/osx/statline_osx.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

-// Version:     $Id: statlmac.cpp 54129 2008-06-11 19:30:52Z SC $
+// Version:     $Id$

 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -37,8 +37,6 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-

 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------


@@ -49,14 +47,14 @@ bool wxStaticLine::Create( wxWindow *parent,
                            const wxSize &size,
                            long style,
                            const wxString &name)
                            const wxSize &size,
                            long style,
                            const wxString &name)

-{
-    m_macIsUserPane = false ;
-
+{    
+    DontCreatePeer();
+    

     if ( !wxStaticLineBase::Create(parent, id, pos, size,
                                    style, wxDefaultValidator, name) )
         return false;
 
     if ( !wxStaticLineBase::Create(parent, id, pos, size,
                                    style, wxDefaultValidator, name) )
         return false;
 

-    m_peer = wxWidgetImpl::CreateStaticLine( this, parent, id, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateStaticLine( this, parent, id, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate(pos,size) ;
 
 
     MacPostControlCreate(pos,size) ;