From bf4ca1d6815d4feb6d791c1a7f3dd7851d5e51a5 Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Tue, 8 Oct 2013 20:33:56 +0000
Subject: [PATCH] Fixed Carbon compilation.

Regression since r74855 and r74954.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/osx/carbon/app.cpp      | 2 +-
 src/osx/nonownedwnd_osx.cpp | 2 ++
 src/osx/window_osx.cpp      | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index 503a29cb0b..1a3d426aaa 100644
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -242,7 +242,7 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)
             return err;
         
         fName = wxMacFSRefToPath( &theRef ) ;
-        files += fName;
+        fileNames.Add( fName );
     }
     
     MacPrintFiles(fileNames);
diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index 9e7f1e185c..0e57c7f9f9 100644
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -496,10 +496,12 @@ WXWindow wxNonOwnedWindow::GetWXWindow() const
     return m_nowpeer ? m_nowpeer->GetWXWindow() : NULL;
 }
 
+#if wxOSX_USE_COCOA_OR_IPHONE
 void *wxNonOwnedWindow::OSXGetViewOrWindow() const
 {
     return GetWXWindow();
 }
+#endif
 
 // ---------------------------------------------------------------------------
 // Shape implementation
diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index afbf5a0a32..3d4eb703c1 100644
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -2545,10 +2545,12 @@ bool wxWindowMac::OSXHandleClicked( double WXUNUSED(timestampsec) )
     return false;
 }
 
+#if wxOSX_USE_COCOA_OR_IPHONE
 void *wxWindowMac::OSXGetViewOrWindow() const
 {
     return GetHandle();
 }
+#endif
 
 wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
 {