Fix DrawStatusField() to work correctly with wxSB_FLAT style.

[wxWidgets.git] / src / osx / core / stdpaths_cf.cpp

diff --git a/src/osx/core/stdpaths_cf.cpp b/src/osx/core/stdpaths_cf.cpp
index 69e524f1fc59cc66ac17dfc5a29ce5a1037277c9..041b8194955617834095ea7814dc2f0a4195ba7f 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/stdpaths.h"
 #include "wx/filename.h"
 #ifdef __WXMAC__

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"

 #endif
 #endif

-#include "wx/mac/corefoundation/cfstring.h"
+#include "wx/osx/core/cfstring.h"

 
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFURL.h>
 
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFURL.h>


@@ -101,7 +101,7 @@ wxString wxStandardPathsCF::GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const
 
 wxString wxStandardPathsCF::GetDocumentsDir() const
 {
 
 wxString wxStandardPathsCF::GetDocumentsDir() const
 {

-#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)
+#if defined( __WXMAC__ ) && wxOSX_USE_CARBON

     return wxMacFindFolderNoSeparator
         (
         kUserDomain,
     return wxMacFindFolderNoSeparator
         (
         kUserDomain,


@@ -119,7 +119,7 @@ wxString wxStandardPathsCF::GetDocumentsDir() const
 
 wxString wxStandardPathsCF::GetConfigDir() const
 {
 
 wxString wxStandardPathsCF::GetConfigDir() const
 {

-#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)
+#if defined( __WXMAC__ ) && wxOSX_USE_CARBON

     return wxMacFindFolder((short)kLocalDomain, kPreferencesFolderType, kCreateFolder);
 #else
     return wxT("/Library/Preferences");
     return wxMacFindFolder((short)kLocalDomain, kPreferencesFolderType, kCreateFolder);
 #else
     return wxT("/Library/Preferences");


@@ -128,7 +128,7 @@ wxString wxStandardPathsCF::GetConfigDir() const
 
 wxString wxStandardPathsCF::GetUserConfigDir() const
 {
 
 wxString wxStandardPathsCF::GetUserConfigDir() const
 {

-#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)
+#if defined( __WXMAC__ ) && wxOSX_USE_CARBON

     return wxMacFindFolder((short)kUserDomain, kPreferencesFolderType, kCreateFolder);
 #else
     return wxFileName::GetHomeDir() + wxT("/Library/Preferences");
     return wxMacFindFolder((short)kUserDomain, kPreferencesFolderType, kCreateFolder);
 #else
     return wxFileName::GetHomeDir() + wxT("/Library/Preferences");


@@ -180,7 +180,7 @@ wxString wxStandardPathsCF::GetExecutablePath() const
 
 wxString wxStandardPathsCF::GetLocalDataDir() const
 {
 
 wxString wxStandardPathsCF::GetLocalDataDir() const
 {

-#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)
+#if defined( __WXMAC__ ) && wxOSX_USE_CARBON

     return AppendAppInfo(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder));
 #else
     return AppendAppInfo(wxT("/Library/Application Support"));
     return AppendAppInfo(wxMacFindFolder((short)kLocalDomain, kApplicationSupportFolderType, kCreateFolder));
 #else
     return AppendAppInfo(wxT("/Library/Application Support"));


@@ -189,10 +189,10 @@ wxString wxStandardPathsCF::GetLocalDataDir() const
 
 wxString wxStandardPathsCF::GetUserDataDir() const
 {
 
 wxString wxStandardPathsCF::GetUserDataDir() const
 {

-#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)
+#if defined( __WXMAC__ ) && wxOSX_USE_CARBON

     return AppendAppInfo(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));
 #else
     return AppendAppInfo(wxMacFindFolder((short)kUserDomain, kApplicationSupportFolderType, kCreateFolder));
 #else

-    return AppendAppInfo(wxFileName::GetHomeDir() + _T("/Library/Application Support"));
+    return AppendAppInfo(wxFileName::GetHomeDir() + wxT("/Library/Application Support"));

 #endif
 }
 
 #endif
 }
 


@@ -211,7 +211,7 @@ wxStandardPathsCF::GetLocalizedResourcesDir(const wxString& lang,
                                             ResourceCat category) const
 {
     return wxStandardPathsBase::
                                             ResourceCat category) const
 {
     return wxStandardPathsBase::

-            GetLocalizedResourcesDir(lang, category) + _T(".lproj");
+            GetLocalizedResourcesDir(lang, category) + wxT(".lproj");

 }
 
 #endif // wxUSE_STDPATHS
 }
 
 #endif // wxUSE_STDPATHS