From afc605b2bebec2f890e84fcc6f6da5ca4e425806 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 19 Nov 2007 19:23:29 +0000 Subject: [PATCH] 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 --- include/wx/mac/corefoundation/cfstring.h | 1 + src/common/intl.cpp | 6 +++--- src/mac/corefoundation/cfstring.cpp | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/wx/mac/corefoundation/cfstring.h b/include/wx/mac/corefoundation/cfstring.h index 16a95cf2ff..4887956206 100644 --- 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 +// Usage: Darwin (base library) ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_CFSTRINGHOLDER_H__ diff --git a/src/common/intl.cpp b/src/common/intl.cpp index a1e7d4d0b8..7c8323ab18 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -76,7 +76,7 @@ #include "wx/mac/private.h" // includes mac headers #endif -#if defined(__WXOSX__) +#if defined(__DARWIN__) #include "wx/mac/corefoundation/cfref.h" #include #include "wx/mac/corefoundation/cfstring.h" @@ -2902,7 +2902,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat)) return str; } -#elif defined(__WXOSX__) +#elif defined(__DARWIN__) /* static */ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat)) @@ -2928,7 +2928,7 @@ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat)) return str.AsString(); } -#else // !__WXMSW__ && !__WXMAC__ +#else // !__WXMSW__ && !__DARWIN__ /* static */ wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat) diff --git a/src/mac/corefoundation/cfstring.cpp b/src/mac/corefoundation/cfstring.cpp index 541cef0c5b..95a2c7a042 100644 --- 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 +// Usage: Darwin (base library) ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" -- 2.47.2