Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
David Elliott
2007-11-19 19:23:29 +00:00
parent b95d7ac96c
commit afc605b2be
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/mac/corefoundation/cfstring.h
View File

@@ -7,6 +7,7 @@
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Stefan Csomor // Copyright: (c) Stefan Csomor
// Licence: wxWindows licence // Licence: wxWindows licence
// Usage: Darwin (base library)
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __WX_CFSTRINGHOLDER_H__ #ifndef __WX_CFSTRINGHOLDER_H__

6
src/common/intl.cpp
View File

@@ -76,7 +76,7 @@
#include "wx/mac/private.h" // includes mac headers #include "wx/mac/private.h" // includes mac headers
#endif #endif
#if defined(__WXOSX__) #if defined(__DARWIN__)
#include "wx/mac/corefoundation/cfref.h" #include "wx/mac/corefoundation/cfref.h"
#include <CoreFoundation/CFLocale.h> #include <CoreFoundation/CFLocale.h>
#include "wx/mac/corefoundation/cfstring.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 */ /* static */
wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat)) 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 */ /* static */
wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat) wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)

1
src/mac/corefoundation/cfstring.cpp
View File

@@ -7,6 +7,7 @@
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Stefan Csomor // Copyright: (c) Stefan Csomor
// Licence: wxWindows licence // Licence: wxWindows licence
// Usage: Darwin (base library)
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h" #include "wx/wxprec.h"