fixing file paths after renaming

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

diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp
index 5b1f8ce7e135a5d046ab713667338d5b1d238248..2d2df5084c659916c9ea7c5a60b3f9e8134cbb07 100644 (file)
--- a/src/osx/core/cfstring.cpp
+++ b/src/osx/core/cfstring.cpp
@@ -20,7 +20,7 @@
     #endif
 #endif
 
-#include "wx/mac/corefoundation/cfstring.h"
+#include "wx/osx/core/cfstring.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 

diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp
index fb9a4d051d21b7b7cb95c5d71a1b0994f3dc07c2..e9f4cdbacaeeb78352aceb1b6a3b2383521d59a5 100644 (file)
--- a/src/osx/core/hid.cpp
+++ b/src/osx/core/hid.cpp
@@ -27,7 +27,7 @@
 //DARWIN _ONLY_
 #ifdef __DARWIN__
 
-#include "wx/mac/corefoundation/hid.h"
+#include "wx/osx/core/hid.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
@@ -37,7 +37,7 @@
     #include "wx/module.h"
 #endif
 
-#include "wx/mac/corefoundation/cfstring.h"
+#include "wx/osx/core/cfstring.h"
 
 // ============================================================================
 // implementation

diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp
index 637546c41458c247a4a867e0c3b5380e2c698c73..95bc4a7bf01c086750bb5052e4ee6442b19d4267 100644 (file)
--- a/src/osx/core/hidjoystick.cpp
+++ b/src/osx/core/hidjoystick.cpp
@@ -41,7 +41,7 @@
 #include "wx/thread.h"      //wxThread for polling thread/ wxCriticalSection
 
 //private headers
-#include "wx/mac/corefoundation/hid.h" //private mac hid stuff
+#include "wx/osx/core/hid.h" //private mac hid stuff
 
 //mac headers
 #include <CoreServices/CoreServices.h>

diff --git a/src/osx/core/stdpaths_cf.cpp b/src/osx/core/stdpaths_cf.cpp
index 69e524f1fc59cc66ac17dfc5a29ce5a1037277c9..b144a77ae0c1d9c5895edff59fde96e149316e6e 100644 (file)
--- a/src/osx/core/stdpaths_cf.cpp
+++ b/src/osx/core/stdpaths_cf.cpp
@@ -28,9 +28,9 @@
 #include "wx/stdpaths.h"
 #include "wx/filename.h"
 #ifdef __WXMAC__
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 #endif
-#include "wx/mac/corefoundation/cfstring.h"
+#include "wx/osx/core/cfstring.h"
 
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFURL.h>

diff --git a/src/osx/core/strconv_cf.cpp b/src/osx/core/strconv_cf.cpp
index e68d8e4ef6af34cc614ea77ffed0fd2427dc4c74..0c2abfbcc825116420396b2c296f8ca0f78500d5 100644 (file)
--- a/src/osx/core/strconv_cf.cpp
+++ b/src/osx/core/strconv_cf.cpp
@@ -21,8 +21,8 @@
 
 #ifdef __DARWIN__
 
-#include "wx/mac/corefoundation/private/strconv_cf.h"
-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/private/strconv_cf.h"
+#include "wx/osx/core/cfref.h"
 
 
 // ============================================================================

diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp
index 377b2464befe33949d425a92a56f3e2e391bee74..a969fc223d66d1d3b97588e6e5def36edd01584d 100644 (file)
--- a/src/osx/core/utilsexc_base.cpp
+++ b/src/osx/core/utilsexc_base.cpp
@@ -39,7 +39,7 @@
 
 // More WX Includes
 #include "wx/filename.h"
-#include "wx/mac/corefoundation/cfstring.h"
+#include "wx/osx/core/cfstring.h"
 
 // Default path style
 #define kDefaultPathStyle kCFURLPOSIXPathStyle