Correct the direction passed to wxDataObject in wxOSX clipboard code.

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

diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp
index 216b6fd9190d81050ad2f8a93f8f2bbe41cb6e29..0d9c91c62976f7aab7a343200c36dc116ef5c13d 100644 (file)
--- a/src/osx/statbox_osx.cpp
+++ b/src/osx/statbox_osx.cpp
@@ -16,8 +16,6 @@
 #include "wx/statbox.h"
 #include "wx/osx/private.h"
 
 #include "wx/statbox.h"
 #include "wx/osx/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-

 bool wxStaticBox::Create( wxWindow *parent,
     wxWindowID id,
     const wxString& label,
 bool wxStaticBox::Create( wxWindow *parent,
     wxWindowID id,
     const wxString& label,


@@ -25,15 +23,15 @@ bool wxStaticBox::Create( wxWindow *parent,
     const wxSize& size,
     long style,
     const wxString& name )
     const wxSize& size,
     long style,
     const wxString& name )

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

     if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
 
     m_labelOrig = m_label = label;
 
     if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
 
     m_labelOrig = m_label = label;
 

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

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


@@ -55,7 +53,11 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
         // pixels (otherwise overlapping occurs at the top). The "other"
         // border has to be 11.
         extraTop = 11;
         // pixels (otherwise overlapping occurs at the top). The "other"
         // border has to be 11.
         extraTop = 11;

+#if wxOSX_USE_COCOA
+        other = 17;
+#else

         other = 11;
         other = 11;

+#endif

     }
 
     *borderTop = extraTop;
     }
 
     *borderTop = extraTop;