fixing dangling includes

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

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index d24c3007de0c29518e4eec30b3b08e554306af50..ccf2a0548f4e9e018e9051a4510710af393b617d 100644 (file)
--- 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
 #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
 #else
     #include "wx/generic/listctrl.h"
 #endif

diff --git a/include/wx/osx/carbon/private.h b/include/wx/osx/carbon/private.h
index 3e35afa471611133f4b941c3e767956ca27ff3a4..d0b3ca3f086f0ef425dd3cd37ea6e32a8e1f4f73 100644 (file)
--- 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/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
 
 
 // app.h
 

diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h
index 7c69b01f79caef1a6cf501fa4e7a0f8c75de9bff..6e4f1e0845cb061c2ea6c7f45cafcd5d015cfa88 100644 (file)
--- a/include/wx/osx/dcmemory.h
+++ b/include/wx/osx/dcmemory.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
 #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
 {
 
 class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
 {

diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h
index 8bf2aa52f437fc276255ae465206c6ded90a8805..cf6c925ab6c4f900acf0ac0489356f9be93b1c1e 100644 (file)
--- a/include/wx/osx/dcscreen.h
+++ b/include/wx/osx/dcscreen.h
@@ -13,7 +13,7 @@
 #define _WX_DCSCREEN_H_
 
 #include "wx/dcclient.h"
 #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
 {
 
 class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxWindowDCImpl
 {

diff --git a/src/osx/carbon/metafile.cpp b/src/osx/carbon/metafile.cpp
index 0c936000670c18a4f2dc63da954d6d4c57e3a8f0..e4605383cb842aeba231b2037b1e17d587b1e87f 100644 (file)
--- 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/clipbrd.h"
 #include "wx/osx/private.h"
 #include "wx/graphics.h"

-#include "wx/osx/carbon/metafile.h"
+#include "wx/osx/metafile.h"

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>