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

conforming to new naming convention of starting all port specific methods with the port prefix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-24 07:56:17 +00:00
parent 7a48e6da90
commit aa6208d975
10 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/fontutil.h
View File

@@ -172,7 +172,7 @@ public:
#if wxOSX_USE_COCOA
WX_NSFontDescriptor m_nsFontDescriptor;
void ValidateNSFontDescriptor();
void OSXValidateNSFontDescriptor();
#endif
#if wxOSX_USE_IPHONE
#endif

17
include/wx/osx/font.h
View File

@@ -128,22 +128,25 @@ public:
#if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
wxUint16 MacGetThemeFontID() const ;
// 'old' Quickdraw accessors
short MacGetFontNum() const;
wxByte MacGetFontStyle() const;
#endif
#if wxOSX_USE_COCOA_OR_CARBON
CGFontRef GetCGFont() const;
CGFontRef OSXGetCGFont() const;
#endif
#if wxOSX_USE_CORE_TEXT
CTFontRef GetCTFont() const;
CTFontRef OSXGetCTFont() const;
#endif
#if wxOSX_USE_ATSU_TEXT
// Returns an ATSUStyle not ATSUStyle*
void* MacGetATSUStyle() const ;
void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; }
#if WXWIN_COMPATIBILITY_2_8
wxDEPRECATED( wxUint32 MacGetATSUFontID() const );
wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const );
@@ -151,14 +154,14 @@ public:
#endif
#if wxOSX_USE_COCOA
WX_NSFont GetNSFont() const;
static WX_NSFont CreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info);
static WX_NSFont CreateNSFont(const wxNativeFontInfo* info);
WX_NSFont OSXGetNSFont() const;
static WX_NSFont OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info);
static WX_NSFont OSXCreateNSFont(const wxNativeFontInfo* info);
#endif
#if wxOSX_USE_IPHONE
WX_UIFont GetUIFont() const;
static WX_NSFont CreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info);
WX_UIFont OSXGetUIFont() const;
static WX_NSFont OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info);
#endif
protected:

2
src/generic/graphicc.cpp
View File

@@ -692,7 +692,7 @@ wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &fo
m_underlined = font.GetUnderlined();
#ifdef __WXMAC__
m_font = cairo_quartz_font_face_create_for_cgfont( font.GetCGFont() );
m_font = cairo_quartz_font_face_create_for_cgfont( font.OSXGetCGFont() );
#elif defined(__WXGTK__)
m_font = pango_font_description_copy( font.GetNativeFontInfo()->description );
#else

16
src/osx/carbon/font.cpp
View File

@@ -384,10 +384,10 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
}
#endif
#if wxOSX_USE_COCOA
m_nsFont = wxFont::CreateNSFont( font, &m_info );
m_nsFont = wxFont::OSXCreateNSFont( font, &m_info );
#endif
#if wxOSX_USE_IPHONE
m_uiFont = wxFont::CreateUIFont( font, &m_info );
m_uiFont = wxFont::OSXCreateUIFont( font, &m_info );
#endif
}
@@ -483,10 +483,10 @@ void wxFontRefData::MacFindFont()
}
#endif
#if wxOSX_USE_COCOA
m_nsFont = wxFont::CreateNSFont( &m_info );
m_nsFont = wxFont::OSXCreateNSFont( &m_info );
#endif
#if wxOSX_USE_IPHONE
m_uiFont = wxFont::CreateUIFont( &m_info );
m_uiFont = wxFont::OSXCreateUIFont( &m_info );
#endif
m_fontValid = true;
}
@@ -799,7 +799,7 @@ wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
#if wxOSX_USE_CORE_TEXT
CTFontRef wxFont::GetCTFont() const
CTFontRef wxFont::OSXGetCTFont() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
@@ -813,7 +813,7 @@ CTFontRef wxFont::GetCTFont() const
#if wxOSX_USE_COCOA_OR_CARBON
CGFontRef wxFont::GetCGFont() const
CGFontRef wxFont::OSXGetCGFont() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
@@ -828,7 +828,7 @@ CGFontRef wxFont::GetCGFont() const
#if wxOSX_USE_COCOA
NSFont* wxFont::GetNSFont() const
NSFont* wxFont::OSXGetNSFont() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
@@ -1057,7 +1057,7 @@ void wxNativeFontInfo::EnsureValid()
#endif
#if wxOSX_USE_COCOA
if ( m_nsFontDescriptor == NULL )
ValidateNSFontDescriptor();
OSXValidateNSFontDescriptor();
#endif
#if wxOSX_USE_IPHONE
// TODO

2
src/osx/carbon/fontdlg.cpp
View File

@@ -232,7 +232,7 @@ int wxFontDialog::ShowModal()
#if wxOSX_USE_CORE_TEXT
if ( UMAGetSystemVersion() >= 0x1050 )
{
CTFontDescriptorRef descr = (CTFontDescriptorRef) CTFontCopyFontDescriptor( (CTFontRef) font.GetCTFont() );
CTFontDescriptorRef descr = (CTFontDescriptorRef) CTFontCopyFontDescriptor( (CTFontRef) font.OSXGetCTFont() );
err = SetFontInfoForSelection (kFontSelectionCoreTextType,1, &descr , NULL);
CFRelease( descr );
setup = true;

10
src/osx/carbon/graphics.cpp
View File

@@ -171,7 +171,7 @@ CGColorRef wxMacCreateCGColor( const wxColour& col )
CTFontRef wxMacCreateCTFont( const wxFont& font )
{
#ifdef __WXMAC__
return wxCFRetain((CTFontRef) font.GetCTFont());
return wxCFRetain((CTFontRef) font.OSXGetCTFont());
#else
return CTFontCreateWithName( wxCFStringRef( font.GetFaceName(), wxLocale::GetSystemEncoding() ) , font.GetPointSize() , NULL );
#endif
@@ -815,7 +815,7 @@ public:
virtual ATSUStyle GetATSUStyle() { return m_macATSUIStyle; }
#endif
#if wxOSX_USE_CORE_TEXT
CTFontRef GetCTFont() const { return m_ctFont ; }
CTFontRef OSXGetCTFont() const { return m_ctFont ; }
#endif
wxColour GetColour() const { return m_colour ; }
@@ -2165,7 +2165,7 @@ void wxMacCoreGraphicsContext::DoDrawText( const wxString &str, wxDouble x, wxDo
{
wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
CTFontRef font = fref->GetCTFont();
CTFontRef font = fref->OSXGetCTFont();
CGColorRef col = wxMacCreateCGColor( fref->GetColour() );
CTUnderlineStyle ustyle = fref->GetUnderlined() ? kCTUnderlineStyleSingle : kCTUnderlineStyleNone ;
wxCFRef<CFNumberRef> underlined( CFNumberCreate(NULL, kCFNumberSInt32Type, &ustyle) );
@@ -2342,7 +2342,7 @@ void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *wid
if ( UMAGetSystemVersion() >= 0x1050 )
{
wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
CTFontRef font = fref->GetCTFont();
CTFontRef font = fref->OSXGetCTFont();
wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
CFStringRef keys[] = { kCTFontAttributeName };
@@ -2437,7 +2437,7 @@ void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArr
#if wxOSX_USE_CORE_TEXT
{
wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
CTFontRef font = fref->GetCTFont();
CTFontRef font = fref->OSXGetCTFont();
wxCFStringRef t(text, wxLocale::GetSystemEncoding() );
CFStringRef keys[] = { kCTFontAttributeName };

2
src/osx/carbon/listctrl_mac.cpp
View File

@@ -2853,7 +2853,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
if (font.Ok())
{
info.fontID = kThemeSpecifiedFont;
info.font = (CTFontRef) font.GetCTFont();
info.font = (CTFontRef) font.OSXGetCTFont();
setup = true;
}
}

6
src/osx/carbon/utilscocoa.mm
View File

@@ -93,7 +93,7 @@ void* wxMacCocoaRetain( void* obj )
#if wxOSX_USE_COCOA
WX_NSFont wxFont::CreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)
WX_NSFont wxFont::OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)
{
NSFont* nsfont = nil;
switch( font )
@@ -154,7 +154,7 @@ WX_NSFont wxFont::CreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info)
return nsfont;
}
void wxNativeFontInfo::ValidateNSFontDescriptor()
void wxNativeFontInfo::OSXValidateNSFontDescriptor()
{
NSFontDescriptor* desc = [NSFontDescriptor fontDescriptorWithName:wxCFStringRef(m_faceName).AsNSString() size:m_pointSize];
NSFontSymbolicTraits traits = 0;
@@ -172,7 +172,7 @@ void wxNativeFontInfo::ValidateNSFontDescriptor()
m_nsFontDescriptor = desc;
}
WX_NSFont wxFont::CreateNSFont(const wxNativeFontInfo* info)
WX_NSFont wxFont::OSXCreateNSFont(const wxNativeFontInfo* info)
{
NSFont* nsFont;
nsFont = [NSFont fontWithDescriptor:info->m_nsFontDescriptor size:info->m_pointSize];

2
src/osx/carbon/window.cpp
View File

@@ -1228,7 +1228,7 @@ void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , l
flush = kHIThemeTextHorizontalFlushCenter;
else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
flush = kHIThemeTextHorizontalFlushRight;
HIViewSetTextFont( m_controlRef , part , (CTFontRef) font.GetCTFont() );
HIViewSetTextFont( m_controlRef , part , (CTFontRef) font.OSXGetCTFont() );
HIViewSetTextHorizontalFlush( m_controlRef, part, flush );
if ( foreground != *wxBLACK || ignoreBlack == false )

2
src/osx/cocoa/window.mm
View File

@@ -1352,7 +1352,7 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool)
{
if ([m_osxView respondsToSelector:@selector(setFont:)])
[m_osxView setFont: font.GetNSFont()];
[m_osxView setFont: font.OSXGetNSFont()];
}
void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )