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

several small fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-09-06 16:33:18 +00:00
parent e630b0f024
commit 36eca86160
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -451,10 +451,12 @@ void wxFontRefData::MacFindFont()
CTFontRef font2 = CTFontCreateCopyWithSymbolicTraits( font, m_pointSize, NULL, traits, 0x03 ); CTFontRef font2 = CTFontCreateCopyWithSymbolicTraits( font, m_pointSize, NULL, traits, 0x03 );
CFRelease(font); CFRelease(font);
m_ctFont.reset( font2 ); m_ctFont.reset( font2 );
#if 0 // debugging coretext font matching
if ( (CTFontGetSymbolicTraits( m_ctFont ) & 0x03) != traits ) if ( (CTFontGetSymbolicTraits( m_ctFont ) & 0x03) != traits )
{ {
wxMessageBox( wxString::Format( "expected %d but got %d traits" , traits, (CTFontGetSymbolicTraits( m_ctFont ) & 0x03) ) ); wxMessageBox( wxString::Format( "expected %d but got %d traits" , traits, (CTFontGetSymbolicTraits( m_ctFont ) & 0x03) ) );
} }
#endif
} }
} }
#if wxOSX_USE_ATSU_TEXT #if wxOSX_USE_ATSU_TEXT

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

@@ -62,7 +62,7 @@ void wxBell()
else else
#endif #endif
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
SysBeep(30); AlertSoundPlay();
#else #else
{ {
} }

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

@@ -31,7 +31,7 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
long style, long style,
long extraStyle) long extraStyle)
{ {
NSView* sv = (wxpeer->GetParent()->GetHandle() ); NSView* sv = static_cast<NSView*>(wxpeer->GetParent()->GetHandle() );
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
wxNSButton* v = [[wxNSButton alloc] initWithFrame:r]; wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];

4
src/osx/cocoa/utils.mm
View File

@@ -56,6 +56,8 @@ void wxMacWakeUp()
#endif // wxUSE_BASE #endif // wxUSE_BASE
#if wxUSE_GUI
bool wxApp::DoInitGui() bool wxApp::DoInitGui()
{ {
[NSApplication sharedApplication]; [NSApplication sharedApplication];
@@ -67,8 +69,6 @@ void wxApp::DoCleanUp()
{ {
} }
#if wxUSE_GUI
void wxClientDisplayRect(int *x, int *y, int *width, int *height) void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{ {
NSRect displayRect = [[NSScreen mainScreen] visibleFrame]; NSRect displayRect = [[NSScreen mainScreen] visibleFrame];