From ccd5d46c7b69632eaa231e8fc7801dd5af2faaa8 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 17 Jan 2009 13:38:04 +0000 Subject: [PATCH] fixing dangling includes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/listctrl.h | 2 +- include/wx/osx/carbon/private.h | 6 +++--- include/wx/osx/dcmemory.h | 2 +- include/wx/osx/dcscreen.h | 2 +- src/osx/carbon/metafile.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index d24c3007de..ccf2a0548f 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -31,7 +31,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[]; #if defined(__WIN32__) && !defined(__WXUNIVERSAL__) #include "wx/msw/listctrl.h" #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON - #include "wx/osx/carbon/listctrl.h" + #include "wx/osx/listctrl.h" #else #include "wx/generic/listctrl.h" #endif diff --git a/include/wx/osx/carbon/private.h b/include/wx/osx/carbon/private.h index 3e35afa471..d0b3ca3f08 100644 --- a/include/wx/osx/carbon/private.h +++ b/include/wx/osx/carbon/private.h @@ -28,9 +28,9 @@ typedef SInt32 SRefCon; #include "wx/osx/uma.h" #include "wx/listbox.h" -#include "wx/osx/carbon/dc.h" -#include "wx/osx/carbon/dcclient.h" -#include "wx/osx/carbon/dcmemory.h" +#include "wx/osx/dc.h" +#include "wx/osx/dcclient.h" +#include "wx/osx/dcmemory.h" // app.h diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h index 7c69b01f79..6e4f1e0845 100644 --- a/include/wx/osx/dcmemory.h +++ b/include/wx/osx/dcmemory.h @@ -12,7 +12,7 @@ #ifndef _WX_DCMEMORY_H_ #define _WX_DCMEMORY_H_ -#include "wx/osx/carbon/dcclient.h" +#include "wx/osx/dcclient.h" class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl { diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h index 8bf2aa52f4..cf6c925ab6 100644 --- a/include/wx/osx/dcscreen.h +++ b/include/wx/osx/dcscreen.h @@ -13,7 +13,7 @@ #define _WX_DCSCREEN_H_ #include "wx/dcclient.h" -#include "wx/osx/carbon/dcclient.h" +#include "wx/osx/dcclient.h" class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxWindowDCImpl { diff --git a/src/osx/carbon/metafile.cpp b/src/osx/carbon/metafile.cpp index 0c93600067..e4605383cb 100644 --- a/src/osx/carbon/metafile.cpp +++ b/src/osx/carbon/metafile.cpp @@ -26,7 +26,7 @@ #include "wx/clipbrd.h" #include "wx/osx/private.h" #include "wx/graphics.h" -#include "wx/osx/carbon/metafile.h" +#include "wx/osx/metafile.h" #include #include -- 2.47.2