several small fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index c2bf64488a028d57fd85e9a508d3dcc694d7cd14..fcd8f90466353931bd7fae2ac55e77f3223407bb 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -451,10 +451,12 @@ void wxFontRefData::MacFindFont()
                 CTFontRef font2 = CTFontCreateCopyWithSymbolicTraits( font, m_pointSize, NULL, traits, 0x03 );
                 CFRelease(font);
                 m_ctFont.reset( font2 );
                 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) ) );
                 }
                 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
             }
         }
 #if wxOSX_USE_ATSU_TEXT

diff --git a/src/osx/carbon/utils.cpp b/src/osx/carbon/utils.cpp
index 70304470394b2d1ac226d2a7b3b37b4d6431e016..e1dd4bcf7d27a4830cb83646c5a6d519a3e71fde 100644 (file)
--- a/src/osx/carbon/utils.cpp
+++ b/src/osx/carbon/utils.cpp
@@ -62,7 +62,7 @@ void wxBell()
     else
 #endif
 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
     else
 #endif
 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5

-        SysBeep(30);
+        AlertSoundPlay();

 #else
     {
     }
 #else
     {
     }

diff --git a/src/osx/cocoa/bmpbuttn.mm b/src/osx/cocoa/bmpbuttn.mm
index a6aebc2ad0ed316fc20f0062defe301db33663cf..3de4eafe5facd3f22a76f3a6e58df12c80382898 100644 (file)
--- a/src/osx/cocoa/bmpbuttn.mm
+++ b/src/osx/cocoa/bmpbuttn.mm
@@ -31,7 +31,7 @@ wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer,
                                     long style, 
                                     long extraStyle) 
 {
                                     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];
     
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSButton* v = [[wxNSButton alloc] initWithFrame:r];

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index c31e4e66c359b92eda20094cf9e66bd23a5070e2..248075e4e5979d5294807eaa6d88882fe40a134e 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -56,6 +56,8 @@ void wxMacWakeUp()
 
 #endif // wxUSE_BASE
  
 
 #endif // wxUSE_BASE
  

+#if wxUSE_GUI
+

 bool wxApp::DoInitGui()
 {
     [NSApplication sharedApplication];
 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];
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
     NSRect displayRect = [[NSScreen mainScreen] visibleFrame];