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

cleanup mac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-11-16 21:00:08 +00:00
parent 400e8540ad
commit 1b5dbd344a
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/intl.cpp
View File

@@ -76,11 +76,6 @@
#include "wx/mac/private.h" // includes mac headers #include "wx/mac/private.h" // includes mac headers
#endif #endif
#if defined(__WXOSX__)
#include "wx/mac/corefoundation/cfstring.h"
#include "wx/mac/corefoundation/cfref.h"
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// simple types // simple types
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -2477,11 +2472,7 @@ wxFontEncoding wxLocale::GetSystemEncoding()
} }
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
TextEncoding encoding = 0 ; TextEncoding encoding = 0 ;
#if TARGET_CARBON
encoding = CFStringGetSystemEncoding() ; encoding = CFStringGetSystemEncoding() ;
#else
UpgradeScriptInfoToTextEncoding ( smSystemScript , kTextLanguageDontCare , kTextRegionDontCare , NULL , &encoding ) ;
#endif
return wxMacGetFontEncFromSystemEnc( encoding ) ; return wxMacGetFontEncFromSystemEnc( encoding ) ;
#elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP #elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
const wxString encname = GetSystemEncodingName(); const wxString encname = GetSystemEncodingName();

3
src/common/utilscmn.cpp
View File

@@ -1055,9 +1055,6 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
err = ICStart(&inst, 'STKA'); // put your app creator code here err = ICStart(&inst, 'STKA'); // put your app creator code here
if (err == noErr) if (err == noErr)
{ {
#if !TARGET_CARBON
err = ICFindConfigFile(inst, 0, NULL);
#endif
if (err == noErr) if (err == noErr)
{ {
ConstStr255Param hint = 0; ConstStr255Param hint = 0;