From d8c736e563cbf50bc5825c1a52878403ee48f513 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Wed, 27 Jun 2001 22:29:47 +0000 Subject: [PATCH] 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 | 1 + src/mac/button.cpp | 2 ++ src/mac/carbon/bmpbuttn.cpp | 1 + src/mac/carbon/button.cpp | 2 ++ src/mac/carbon/checkbox.cpp | 2 ++ src/mac/carbon/choice.cpp | 3 ++- src/mac/carbon/clipbrd.cpp | 5 ----- src/mac/carbon/control.cpp | 2 ++ src/mac/carbon/radiobox.cpp | 2 ++ src/mac/carbon/radiobut.cpp | 5 ++++- src/mac/carbon/scrolbar.cpp | 2 ++ src/mac/carbon/statbmp.cpp | 2 ++ src/mac/carbon/statbox.cpp | 2 ++ src/mac/carbon/tabctrl.cpp | 2 ++ src/mac/checkbox.cpp | 2 ++ src/mac/choice.cpp | 3 ++- src/mac/clipbrd.cpp | 5 ----- src/mac/control.cpp | 2 ++ src/mac/radiobox.cpp | 2 ++ src/mac/radiobut.cpp | 5 ++++- src/mac/scrolbar.cpp | 2 ++ src/mac/statbmp.cpp | 2 ++ src/mac/statbox.cpp | 2 ++ src/mac/tabctrl.cpp | 2 ++ 24 files changed, 46 insertions(+), 14 deletions(-) diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp index dbbfc52d7a..3b4a0a5d85 100644 --- 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 53c0861dbe..d4837fd54a 100644 --- 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 dbbfc52d7a..3b4a0a5d85 100644 --- 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 53c0861dbe..d4837fd54a 100644 --- 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 f3eb8eca63..0d5d9e1e46 100644 --- 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 73dfa522d3..ec6a728102 100644 --- 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 f493b5bf65..2f7651852a 100644 --- 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 e5cab1485a..f0714b067a 100644 --- 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 905618716f..c7bf4dce28 100644 --- 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 c786409a4d..8fd9b91adf 100644 --- 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 diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp index a022802c05..e9d45ce4e5 100644 --- 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 40793c756a..007070cb89 100644 --- 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 c50c7d8a28..06d35460ac 100644 --- 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 9d840214d0..2b4a07e0fb 100644 --- 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 f3eb8eca63..0d5d9e1e46 100644 --- 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 73dfa522d3..ec6a728102 100644 --- 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 f493b5bf65..2f7651852a 100644 --- 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 e5cab1485a..f0714b067a 100644 --- 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 905618716f..c7bf4dce28 100644 --- 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 c786409a4d..8fd9b91adf 100644 --- 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 diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp index a022802c05..e9d45ce4e5 100644 --- 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 40793c756a..007070cb89 100644 --- 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 c50c7d8a28..06d35460ac 100644 --- 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 9d840214d0..2b4a07e0fb 100644 --- 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" -- 2.47.2