Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp
index 52f3d407331cc40daa2fa89eaa99d9acd7821e42..80d0ea1c4977c41417abcab5aa07081005a9c6a6 100644 (file)
--- a/src/mac/carbon/statlmac.cpp
+++ b/src/mac/carbon/statlmac.cpp
@@ -16,13 +16,15 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "statline.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
     #pragma implementation "statline.h"
 #endif
 
 // 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


@@ -30,6 +32,8 @@
 #include "wx/statline.h"
 #include "wx/statbox.h"
 
 #include "wx/statline.h"
 #include "wx/statbox.h"
 

+#include "wx/mac/uma.h"
+

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


@@ -47,15 +51,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 ;
+    
+    if ( !wxStaticLineBase::Create(parent, id, pos, size,
+                                   style, wxDefaultValidator, name) )
+        return false;

 
 

-    // ok, this is ugly but it's better than nothing: use a thin static box to
-    // emulate static line
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    m_peer = new wxMacControl(this) ;
+    verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, m_peer->GetControlRefAddr() ) ) ;  

 
 

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

 
     return TRUE;
 }
 
     return TRUE;
 }

+
+#endif //wxUSE_STATLINE