added missing includes after wxUniv merge

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/bmpbuttn.cpp

@@ -13,6 +13,7 @@
 #pragma implementation "bmpbuttn.h"
 #endif
 
+#include "wx/window.h"
 #include "wx/bmpbuttn.h"
 
 #if !USE_SHARED_LIBRARY

src/mac/button.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "button.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/button.h"
 #include "wx/panel.h"
 

src/mac/carbon/bmpbuttn.cpp

@@ -13,6 +13,7 @@
 #pragma implementation "bmpbuttn.h"
 #endif
 
+#include "wx/window.h"
 #include "wx/bmpbuttn.h"
 
 #if !USE_SHARED_LIBRARY

src/mac/carbon/button.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "button.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/button.h"
 #include "wx/panel.h"
 

src/mac/carbon/checkbox.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "checkbox.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/checkbox.h"
 
 #if !USE_SHARED_LIBRARY

src/mac/carbon/choice.cpp

@@ -13,7 +13,8 @@
 #pragma implementation "choice.h"
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
+#include "wx/defs.h"
+
 #include "wx/choice.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"

src/mac/carbon/clipbrd.cpp

@@ -363,11 +363,6 @@ bool wxClipboard::GetData( wxDataObject& data )
     /* get formats from wxDataObjects */
     if ( !transferred ) 
     {
-  #if !TARGET_CARBON
-  	OSErr err = noErr ;
-  #else
-  	OSStatus err = noErr ;
-  #endif
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
           wxDataFormat format = array[i] ;

src/mac/carbon/control.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "control.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/app.h"

src/mac/carbon/radiobox.cpp

@@ -17,6 +17,8 @@
 #pragma implementation "radiobox.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/radiobox.h"
 #include "wx/radiobut.h"
 #include "wx/mac/uma.h"

src/mac/carbon/radiobut.cpp

@@ -13,10 +13,13 @@
 #pragma implementation "radiobut.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/radiobut.h"
 
-
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
+#endif
 
 #include <wx/mac/uma.h>
 

src/mac/carbon/scrolbar.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "scrolbar.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 

src/mac/carbon/statbmp.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "statbmp.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/statbmp.h"
 #include "wx/dcclient.h"
 

src/mac/carbon/statbox.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "statbox.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/statbox.h"
 #include "wx/mac/uma.h"
 

src/mac/carbon/tabctrl.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "tabctrl.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/control.h"
 #include "wx/tabctrl.h"
 #include "wx/mac/uma.h"

src/mac/checkbox.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "checkbox.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/checkbox.h"
 
 #if !USE_SHARED_LIBRARY

src/mac/choice.cpp

@@ -13,7 +13,8 @@
 #pragma implementation "choice.h"
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
+#include "wx/defs.h"
+
 #include "wx/choice.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"

src/mac/clipbrd.cpp

@@ -363,11 +363,6 @@ bool wxClipboard::GetData( wxDataObject& data )
     /* get formats from wxDataObjects */
     if ( !transferred ) 
     {
-  #if !TARGET_CARBON
-  	OSErr err = noErr ;
-  #else
-  	OSStatus err = noErr ;
-  #endif
       for (size_t i = 0; !transferred && i < formatcount ; i++)
       {
           wxDataFormat format = array[i] ;

src/mac/control.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "control.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/app.h"

src/mac/radiobox.cpp

@@ -17,6 +17,8 @@
 #pragma implementation "radiobox.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/radiobox.h"
 #include "wx/radiobut.h"
 #include "wx/mac/uma.h"

src/mac/radiobut.cpp

@@ -13,10 +13,13 @@
 #pragma implementation "radiobut.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/radiobut.h"
 
-
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
+#endif
 
 #include <wx/mac/uma.h>
 

src/mac/scrolbar.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "scrolbar.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 

src/mac/statbmp.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "statbmp.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/statbmp.h"
 #include "wx/dcclient.h"
 

src/mac/statbox.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "statbox.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/statbox.h"
 #include "wx/mac/uma.h"
 

src/mac/tabctrl.cpp

@@ -13,6 +13,8 @@
 #pragma implementation "tabctrl.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/control.h"
 #include "wx/tabctrl.h"
 #include "wx/mac/uma.h"