removed USE_SHARED_LIBRARY mentions (and all variations in spelling) (patch 1231184)

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

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index 11ed5fc74fef125547937c7b24b4dbdd3cb180f5..380a5ff1a10424cb1826621702ec325fded6859c 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -9,18 +9,18 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "checkbox.h"
 #endif
 
 #pragma implementation "checkbox.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_CHECKBOX

 
 #include "wx/checkbox.h"
 
 
 #include "wx/checkbox.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)

-#endif

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


@@ -43,9 +43,9 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         maxValue = 2 /* kControlCheckboxMixedValue */;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
         maxValue = 2 /* kControlCheckboxMixedValue */;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

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

     verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,
     verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,

-        CFSTR("") , 0 , false , *m_peer ) );
+        CFSTR("") , 0 , false , m_peer->GetControlRefAddr() ) );

     
     m_peer->SetMaximum( maxValue ) ;
     
     
     m_peer->SetMaximum( maxValue ) ;
     


@@ -178,4 +178,4 @@ bool wxBitmapCheckBox::GetValue() const
     return FALSE;
 }
 
     return FALSE;
 }
 

-
+#endif