diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index 9ca03e3511..fa8075efe5 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -82,12 +82,12 @@ #if wxUSE_GUI typedef SInt16 ThemeBrush; -CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ; +CGColorRef WXDLLIMPEXP_CORE wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ; OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage( CGContextRef inContext, const CGRect * inBounds, CGImageRef inImage) ; -WX_NSImage wxOSXCreateNSImageFromCGImage( CGImageRef image ); +WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image ); #endif long UMAGetSystemVersion() ; diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp index 6331ca653a..14c97c2f85 100644 --- a/src/osx/carbon/app.cpp +++ b/src/osx/carbon/app.cpp @@ -956,7 +956,7 @@ void wxApp::CleanUp() // misc initialization stuff //---------------------------------------------------------------------- -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 +#if wxOSX_USE_CARBON && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec) { OSStatus err = noErr ;