added missing includes after wxUniv merge

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

diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp
index dbbfc52d7a6522ec580ed1f53a944d7467cd579e..3b4a0a5d85a72c92aea3ebba3eb10dd11e1b6a97 100644 (file)
--- a/src/mac/bmpbuttn.cpp
+++ b/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

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index 53c0861dbe5bac228463e87318395a9d38180b2c..d4837fd54a90709aaeb3b6b281215ff1785f7ddd 100644 (file)
--- a/src/mac/button.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index dbbfc52d7a6522ec580ed1f53a944d7467cd579e..3b4a0a5d85a72c92aea3ebba3eb10dd11e1b6a97 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 53c0861dbe5bac228463e87318395a9d38180b2c..d4837fd54a90709aaeb3b6b281215ff1785f7ddd 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index f3eb8eca635db5077488bc79d1bd6ce90e0bd374..0d5d9e1e46ea91a969556d1e88510db9c7f11fb4 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 73dfa522d3df73fd958705feb647509e7e891c04..ec6a728102ba92f6d235c28e5a3ae68eca31bad6 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/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"

diff --git a/src/mac/carbon/clipbrd.cpp b/src/mac/carbon/clipbrd.cpp
index f493b5bf6531b6dae7e88d5fc22682af9b2f4e85..2f7651852aa227aeb73b69186208187d936fceca 100644 (file)
--- a/src/mac/carbon/clipbrd.cpp
+++ b/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] ;

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index e5cab1485a1f816b5ef98df5f81bdf3168a08604..f0714b067a99305774f138b94d0860d40b1c77a8 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/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"

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 905618716f44a98ec8c67a70b9337cf387541af9..c7bf4dce281ff9f8b3207758c648772a5cc7f78f 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/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"

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index c786409a4dc839ddba4ca5a1e86cdaa5792d7340..8fd9b91adf5e82680212c86d5fdcde816269e585 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -13,10 +13,13 @@
 #pragma implementation "radiobut.h"
 #endif
 
-#include "wx/radiobut.h"
+#include "wx/defs.h"
 
+#include "wx/radiobut.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
+#endif
 
 #include <wx/mac/uma.h>
 

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index a022802c0597caa1579428975ccb4024847d409a..e9d45ce4e5838b3c1760966e0632ce8cd9412c3a 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 40793c756a3b734738b0821d494ca516c8e5785b..007070cb89fd1866d5df97ef69a20837c08334bc 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index c50c7d8a28b06d37414f0880f5ef16d01023d90b..06d35460acc452395600b633f503c18797409259 100644 (file)
--- a/src/mac/carbon/statbox.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index 9d840214d00982a5b5f36e4585d4d500299006d8..2b4a07e0fbf3d56e670a56b2ad04d1831d0804e5 100644 (file)
--- a/src/mac/carbon/tabctrl.cpp
+++ b/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"

diff --git a/src/mac/checkbox.cpp b/src/mac/checkbox.cpp
index f3eb8eca635db5077488bc79d1bd6ce90e0bd374..0d5d9e1e46ea91a969556d1e88510db9c7f11fb4 100644 (file)
--- a/src/mac/checkbox.cpp
+++ b/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

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 73dfa522d3df73fd958705feb647509e7e891c04..ec6a728102ba92f6d235c28e5a3ae68eca31bad6 100644 (file)
--- a/src/mac/choice.cpp
+++ b/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"

diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp
index f493b5bf6531b6dae7e88d5fc22682af9b2f4e85..2f7651852aa227aeb73b69186208187d936fceca 100644 (file)
--- a/src/mac/clipbrd.cpp
+++ b/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] ;

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index e5cab1485a1f816b5ef98df5f81bdf3168a08604..f0714b067a99305774f138b94d0860d40b1c77a8 100644 (file)
--- a/src/mac/control.cpp
+++ b/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"

diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp
index 905618716f44a98ec8c67a70b9337cf387541af9..c7bf4dce281ff9f8b3207758c648772a5cc7f78f 100644 (file)
--- a/src/mac/radiobox.cpp
+++ b/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"

diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index c786409a4dc839ddba4ca5a1e86cdaa5792d7340..8fd9b91adf5e82680212c86d5fdcde816269e585 100644 (file)
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -13,10 +13,13 @@
 #pragma implementation "radiobut.h"
 #endif
 
-#include "wx/radiobut.h"
+#include "wx/defs.h"
 
+#include "wx/radiobut.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
+#endif
 
 #include <wx/mac/uma.h>
 

diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index a022802c0597caa1579428975ccb4024847d409a..e9d45ce4e5838b3c1760966e0632ce8cd9412c3a 100644 (file)
--- a/src/mac/scrolbar.cpp
+++ b/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"
 

diff --git a/src/mac/statbmp.cpp b/src/mac/statbmp.cpp
index 40793c756a3b734738b0821d494ca516c8e5785b..007070cb89fd1866d5df97ef69a20837c08334bc 100644 (file)
--- a/src/mac/statbmp.cpp
+++ b/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"
 

diff --git a/src/mac/statbox.cpp b/src/mac/statbox.cpp
index c50c7d8a28b06d37414f0880f5ef16d01023d90b..06d35460acc452395600b633f503c18797409259 100644 (file)
--- a/src/mac/statbox.cpp
+++ b/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"
 

diff --git a/src/mac/tabctrl.cpp b/src/mac/tabctrl.cpp
index 9d840214d00982a5b5f36e4585d4d500299006d8..2b4a07e0fbf3d56e670a56b2ad04d1831d0804e5 100644 (file)
--- a/src/mac/tabctrl.cpp
+++ b/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"