Document the cfstring.h/cfstring.cpp as being used by all Darwin ports (it's

now part of the common base library).
Use the CFLocale-based code on all Darwin systems instead of testing
__WXOSX__ in base-library code which is NEVER appropriate.

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

diff --git a/include/wx/mac/corefoundation/cfstring.h b/include/wx/mac/corefoundation/cfstring.h
index 16a95cf2ffa157fcba1ee4c495b0de93c9e1dde0..4887956206e2498ba6cc8fa7789d3990956a8097 100644 (file)
--- a/include/wx/mac/corefoundation/cfstring.h
+++ b/include/wx/mac/corefoundation/cfstring.h
@@ -7,6 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence

+// Usage:       Darwin (base library)

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_CFSTRINGHOLDER_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_CFSTRINGHOLDER_H__

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index a1e7d4d0b8441aa868765385b6abd643e2f3bbb7..7c8323ab1859ae5d70ef5eb39bc52e411ffd19c6 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -76,7 +76,7 @@
     #include "wx/mac/private.h"  // includes mac headers
 #endif
 
     #include "wx/mac/private.h"  // includes mac headers
 #endif
 

-#if defined(__WXOSX__)
+#if defined(__DARWIN__)

        #include "wx/mac/corefoundation/cfref.h"
        #include <CoreFoundation/CFLocale.h>
        #include "wx/mac/corefoundation/cfstring.h"
        #include "wx/mac/corefoundation/cfref.h"
        #include <CoreFoundation/CFLocale.h>
        #include "wx/mac/corefoundation/cfstring.h"


@@ -2902,7 +2902,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
     return str;
 }
 
     return str;
 }
 

-#elif defined(__WXOSX__)
+#elif defined(__DARWIN__)

 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))


@@ -2928,7 +2928,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
     return str.AsString();
 }
 
     return str.AsString();
 }
 

-#else // !__WXMSW__ && !__WXMAC__
+#else // !__WXMSW__ && !__DARWIN__

 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
 
 /* static */
 wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)

diff --git a/src/mac/corefoundation/cfstring.cpp b/src/mac/corefoundation/cfstring.cpp
index 541cef0c5be3c122f6c4a13cc395e9fe695059d1..95a2c7a04259c8c304791847c00d138376ac4ea8 100644 (file)
--- a/src/mac/corefoundation/cfstring.cpp
+++ b/src/mac/corefoundation/cfstring.cpp
@@ -7,6 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence

+// Usage:       Darwin (base library)

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"