Unified flags for orienting wxBookCtrls (with backward compatibility). Centralised...

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 28b8697630fa1bdbf25d6fd19c2080bd4e2d706d..9ece344ddf484fdb597893682372bab22543216f 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -9,19 +9,13 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "button.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 #include "wx/button.h"
 #include "wx/panel.h"
 #include "wx/stockitem.h"
 
 
 #include "wx/button.h"
 #include "wx/panel.h"
 #include "wx/stockitem.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)

-#endif

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


@@ -44,7 +38,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
     m_label = label ;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     m_label = label ;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;

     if ( id == wxID_HELP )
     {
         ControlButtonContentInfo info ;
     if ( id == wxID_HELP )
     {
         ControlButtonContentInfo info ;