changes for command line builds of osx-cocoa

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

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 9ca03e3511c9df820418437ee686bd6a19d2a1e1..fa8075efe560b0e0a6371cae07350239f44548a6 100644 (file)
--- 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 6331ca653ac6f862d0620eb14d48b6fc6dbc2952..14c97c2f85d9f525bb2d35241f1ec47410c439eb 100644 (file)
--- 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 ;