several small fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -451,10 +451,12 @@ void wxFontRefData::MacFindFont()
|
||||
CTFontRef font2 = CTFontCreateCopyWithSymbolicTraits( font, m_pointSize, NULL, traits, 0x03 );
|
||||
CFRelease(font);
|
||||
m_ctFont.reset( font2 );
|
||||
#if 0 // debugging coretext font matching
|
||||
if ( (CTFontGetSymbolicTraits( m_ctFont ) & 0x03) != traits )
|
||||
{
|
||||
wxMessageBox( wxString::Format( "expected %d but got %d traits" , traits, (CTFontGetSymbolicTraits( m_ctFont ) & 0x03) ) );
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#if wxOSX_USE_ATSU_TEXT
|
||||
|
@@ -62,7 +62,7 @@ void wxBell()
|
||||
else
|
||||
#endif
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
|
||||
SysBeep(30);
|
||||
AlertSoundPlay();
|
||||
#else
|
||||
{
|
||||
}
|
||||
|
@@ -31,7 +31,7 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
|
||||
long style,
|
||||
long extraStyle)
|
||||
{
|
||||
NSView* sv = (wxpeer->GetParent()->GetHandle() );
|
||||
NSView* sv = static_cast<NSView*>(wxpeer->GetParent()->GetHandle() );
|
||||
|
||||
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
|
||||
wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];
|
||||
|
@@ -56,6 +56,8 @@ void wxMacWakeUp()
|
||||
|
||||
#endif // wxUSE_BASE
|
||||
|
||||
#if wxUSE_GUI
|
||||
|
||||
bool wxApp::DoInitGui()
|
||||
{
|
||||
[NSApplication sharedApplication];
|
||||
@@ -67,8 +69,6 @@ void wxApp::DoCleanUp()
|
||||
{
|
||||
}
|
||||
|
||||
#if wxUSE_GUI
|
||||
|
||||
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
|
||||
{
|
||||
NSRect displayRect = [[NSScreen mainScreen] visibleFrame];
|
||||
|
Reference in New Issue
Block a user