From d497dca47560bb375902c2a261d819e7470a92b3 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sun, 7 Oct 2001 18:45:17 +0000 Subject: [PATCH] include wxWindows headers using "..." instead of <...> git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/bmpbuttn.cpp | 2 +- src/mac/button.cpp | 2 +- src/mac/carbon/bmpbuttn.cpp | 2 +- src/mac/carbon/button.cpp | 2 +- src/mac/carbon/checkbox.cpp | 2 +- src/mac/carbon/control.cpp | 2 +- src/mac/carbon/dcclient.cpp | 2 +- src/mac/carbon/dialog.cpp | 2 +- src/mac/carbon/frame.cpp | 2 +- src/mac/carbon/gauge.cpp | 2 +- src/mac/carbon/joystick.cpp | 4 ++-- src/mac/carbon/listbox.cpp | 2 +- src/mac/carbon/menuitem.cpp | 2 +- src/mac/carbon/notebmac.cpp | 10 +++++----- src/mac/carbon/radiobut.cpp | 2 +- src/mac/carbon/statlmac.cpp | 2 +- src/mac/carbon/stattext.cpp | 2 +- src/mac/carbon/taskbar.cpp | 2 +- src/mac/carbon/toolbar.cpp | 2 +- src/mac/carbon/window.cpp | 2 +- src/mac/checkbox.cpp | 2 +- src/mac/control.cpp | 2 +- src/mac/dcclient.cpp | 2 +- src/mac/dialog.cpp | 2 +- src/mac/frame.cpp | 2 +- src/mac/gauge.cpp | 2 +- src/mac/joystick.cpp | 4 ++-- src/mac/listbox.cpp | 2 +- src/mac/menuitem.cpp | 2 +- src/mac/notebmac.cpp | 10 +++++----- src/mac/radiobut.cpp | 2 +- src/mac/statlmac.cpp | 2 +- src/mac/stattext.cpp | 2 +- src/mac/taskbar.cpp | 2 +- src/mac/toolbar.cpp | 2 +- src/mac/window.cpp | 2 +- 36 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp index 3b4a0a5d85..d63ddcb227 100644 --- a/src/mac/bmpbuttn.cpp +++ b/src/mac/bmpbuttn.cpp @@ -20,7 +20,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #endif -#include +#include "wx/mac/uma.h" PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ; diff --git a/src/mac/button.cpp b/src/mac/button.cpp index e8a9b079b6..b8689ca0fd 100644 --- a/src/mac/button.cpp +++ b/src/mac/button.cpp @@ -22,7 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) #endif -#include +#include "wx/mac/uma.h" // Button diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp index 3b4a0a5d85..d63ddcb227 100644 --- a/src/mac/carbon/bmpbuttn.cpp +++ b/src/mac/carbon/bmpbuttn.cpp @@ -20,7 +20,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #endif -#include +#include "wx/mac/uma.h" PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ; diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index e8a9b079b6..b8689ca0fd 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -22,7 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) #endif -#include +#include "wx/mac/uma.h" // Button diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp index 0d5d9e1e46..5ae3a1bbbd 100644 --- a/src/mac/carbon/checkbox.cpp +++ b/src/mac/carbon/checkbox.cpp @@ -22,7 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) #endif -#include +#include "wx/mac/uma.h" // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index d9735a9c22..764da5b8c2 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -40,7 +40,7 @@ BEGIN_EVENT_TABLE(wxControl, wxWindow) END_EVENT_TABLE() #endif -#include +#include "wx/mac/uma.h" // Item members diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index 99ee68a0fb..74533a7442 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -39,7 +39,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) * wxWindowDC */ -#include +#include "wx/mac/uma.h" wxWindowDC::wxWindowDC() { diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index 8275205594..1537065f54 100644 --- a/src/mac/carbon/dialog.cpp +++ b/src/mac/carbon/dialog.cpp @@ -19,7 +19,7 @@ #include "wx/app.h" #include "wx/settings.h" -#include +#include "wx/mac/uma.h" // Lists to keep track of windows, so we can disable/enable them // for modal dialogs diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index f9f0d2bec6..5b2a84bbb3 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -23,7 +23,7 @@ #include "wx/settings.h" #include "wx/app.h" -#include +#include "wx/mac/uma.h" extern wxWindowList wxModelessWindows; extern wxList wxPendingDelete; diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp index fe19204a45..37155cafb0 100644 --- a/src/mac/carbon/gauge.cpp +++ b/src/mac/carbon/gauge.cpp @@ -19,7 +19,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) #endif -#include +#include "wx/mac/uma.h" bool wxGauge::Create(wxWindow *parent, wxWindowID id, int range, diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp index 2aecad336d..bfe4ee3533 100644 --- a/src/mac/carbon/joystick.cpp +++ b/src/mac/carbon/joystick.cpp @@ -13,9 +13,9 @@ #pragma implementation "joystick.h" #endif -#include +#include "wx/setup.h" -#include +#include "wx/joystick.h" #if wxUSE_JOYSTICK diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index b17715ec55..cb3a39dbd9 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -32,7 +32,7 @@ BEGIN_EVENT_TABLE(wxListBox, wxControl) END_EVENT_TABLE() #endif -#include +#include "wx/mac/uma.h" extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ; const short kwxMacListWithVerticalScrollbar = 128 ; diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp index 6db2d12561..d6b12d09ba 100644 --- a/src/mac/carbon/menuitem.cpp +++ b/src/mac/carbon/menuitem.cpp @@ -17,7 +17,7 @@ #include "wx/menu.h" #include "wx/menuitem.h" -#include +#include "wx/mac/uma.h" // ============================================================================ // implementation // ============================================================================ diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 6f555d06c9..17b89bde2e 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -20,11 +20,11 @@ #pragma implementation "notebook.h" #endif -#include -#include -#include -#include -#include +#include "wx/string.h" +#include "wx/log.h" +#include "wx/imaglist.h" +#include "wx/notebook.h" +#include "wx/mac/uma.h" // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp index 8fd9b91adf..196fed3a4b 100644 --- a/src/mac/carbon/radiobut.cpp +++ b/src/mac/carbon/radiobut.cpp @@ -21,7 +21,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) #endif -#include +#include "wx/mac/uma.h" bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp index f5802a2095..4384627196 100644 --- a/src/mac/carbon/statlmac.cpp +++ b/src/mac/carbon/statlmac.cpp @@ -30,7 +30,7 @@ #include "wx/statline.h" #include "wx/statbox.h" -#include +#include "wx/mac/uma.h" // ============================================================================ // implementation diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index 86c4fd7158..d364a2c5be 100644 --- a/src/mac/carbon/stattext.cpp +++ b/src/mac/carbon/stattext.cpp @@ -26,7 +26,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) #endif -#include +#include "wx/mac/uma.h" BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase) EVT_PAINT(wxStaticText::OnPaint) diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp index 5c91250cf0..1b49a2d75a 100644 --- a/src/mac/carbon/taskbar.cpp +++ b/src/mac/carbon/taskbar.cpp @@ -14,7 +14,7 @@ #pragma implementation "taskbar.h" #endif -#include +#include "wx/taskbar.h" wxTaskBarIcon::wxTaskBarIcon() { diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index af7b209f37..984b5ab8d2 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -29,7 +29,7 @@ BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) END_EVENT_TABLE() #endif -#include +#include "wx/mac/uma.h" // ---------------------------------------------------------------------------- // private classes diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 3f12059d91..40f2f2a960 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -45,7 +45,7 @@ #define wxWINDOW_VSCROLL 5997 #define MAC_SCROLLBAR_SIZE 16 -#include +#include "wx/mac/uma.h" #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" diff --git a/src/mac/checkbox.cpp b/src/mac/checkbox.cpp index 0d5d9e1e46..5ae3a1bbbd 100644 --- a/src/mac/checkbox.cpp +++ b/src/mac/checkbox.cpp @@ -22,7 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) #endif -#include +#include "wx/mac/uma.h" // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/mac/control.cpp b/src/mac/control.cpp index d9735a9c22..764da5b8c2 100644 --- a/src/mac/control.cpp +++ b/src/mac/control.cpp @@ -40,7 +40,7 @@ BEGIN_EVENT_TABLE(wxControl, wxWindow) END_EVENT_TABLE() #endif -#include +#include "wx/mac/uma.h" // Item members diff --git a/src/mac/dcclient.cpp b/src/mac/dcclient.cpp index 99ee68a0fb..74533a7442 100644 --- a/src/mac/dcclient.cpp +++ b/src/mac/dcclient.cpp @@ -39,7 +39,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC) * wxWindowDC */ -#include +#include "wx/mac/uma.h" wxWindowDC::wxWindowDC() { diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp index 8275205594..1537065f54 100644 --- a/src/mac/dialog.cpp +++ b/src/mac/dialog.cpp @@ -19,7 +19,7 @@ #include "wx/app.h" #include "wx/settings.h" -#include +#include "wx/mac/uma.h" // Lists to keep track of windows, so we can disable/enable them // for modal dialogs diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp index f9f0d2bec6..5b2a84bbb3 100644 --- a/src/mac/frame.cpp +++ b/src/mac/frame.cpp @@ -23,7 +23,7 @@ #include "wx/settings.h" #include "wx/app.h" -#include +#include "wx/mac/uma.h" extern wxWindowList wxModelessWindows; extern wxList wxPendingDelete; diff --git a/src/mac/gauge.cpp b/src/mac/gauge.cpp index fe19204a45..37155cafb0 100644 --- a/src/mac/gauge.cpp +++ b/src/mac/gauge.cpp @@ -19,7 +19,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) #endif -#include +#include "wx/mac/uma.h" bool wxGauge::Create(wxWindow *parent, wxWindowID id, int range, diff --git a/src/mac/joystick.cpp b/src/mac/joystick.cpp index 2aecad336d..bfe4ee3533 100644 --- a/src/mac/joystick.cpp +++ b/src/mac/joystick.cpp @@ -13,9 +13,9 @@ #pragma implementation "joystick.h" #endif -#include +#include "wx/setup.h" -#include +#include "wx/joystick.h" #if wxUSE_JOYSTICK diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp index b17715ec55..cb3a39dbd9 100644 --- a/src/mac/listbox.cpp +++ b/src/mac/listbox.cpp @@ -32,7 +32,7 @@ BEGIN_EVENT_TABLE(wxListBox, wxControl) END_EVENT_TABLE() #endif -#include +#include "wx/mac/uma.h" extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ; const short kwxMacListWithVerticalScrollbar = 128 ; diff --git a/src/mac/menuitem.cpp b/src/mac/menuitem.cpp index 6db2d12561..d6b12d09ba 100644 --- a/src/mac/menuitem.cpp +++ b/src/mac/menuitem.cpp @@ -17,7 +17,7 @@ #include "wx/menu.h" #include "wx/menuitem.h" -#include +#include "wx/mac/uma.h" // ============================================================================ // implementation // ============================================================================ diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp index 6f555d06c9..17b89bde2e 100644 --- a/src/mac/notebmac.cpp +++ b/src/mac/notebmac.cpp @@ -20,11 +20,11 @@ #pragma implementation "notebook.h" #endif -#include -#include -#include -#include -#include +#include "wx/string.h" +#include "wx/log.h" +#include "wx/imaglist.h" +#include "wx/notebook.h" +#include "wx/mac/uma.h" // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp index 8fd9b91adf..196fed3a4b 100644 --- a/src/mac/radiobut.cpp +++ b/src/mac/radiobut.cpp @@ -21,7 +21,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) #endif -#include +#include "wx/mac/uma.h" bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/mac/statlmac.cpp b/src/mac/statlmac.cpp index f5802a2095..4384627196 100644 --- a/src/mac/statlmac.cpp +++ b/src/mac/statlmac.cpp @@ -30,7 +30,7 @@ #include "wx/statline.h" #include "wx/statbox.h" -#include +#include "wx/mac/uma.h" // ============================================================================ // implementation diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp index 86c4fd7158..d364a2c5be 100644 --- a/src/mac/stattext.cpp +++ b/src/mac/stattext.cpp @@ -26,7 +26,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) #endif -#include +#include "wx/mac/uma.h" BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase) EVT_PAINT(wxStaticText::OnPaint) diff --git a/src/mac/taskbar.cpp b/src/mac/taskbar.cpp index 5c91250cf0..1b49a2d75a 100644 --- a/src/mac/taskbar.cpp +++ b/src/mac/taskbar.cpp @@ -14,7 +14,7 @@ #pragma implementation "taskbar.h" #endif -#include +#include "wx/taskbar.h" wxTaskBarIcon::wxTaskBarIcon() { diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp index af7b209f37..984b5ab8d2 100644 --- a/src/mac/toolbar.cpp +++ b/src/mac/toolbar.cpp @@ -29,7 +29,7 @@ BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) END_EVENT_TABLE() #endif -#include +#include "wx/mac/uma.h" // ---------------------------------------------------------------------------- // private classes diff --git a/src/mac/window.cpp b/src/mac/window.cpp index 3f12059d91..40f2f2a960 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -45,7 +45,7 @@ #define wxWINDOW_VSCROLL 5997 #define MAC_SCROLLBAR_SIZE 16 -#include +#include "wx/mac/uma.h" #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" -- 2.47.2