AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Carbon compilation.

Browse Source 
Regression since r74855 and r74954.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth 2013-10-08 20:33:56 +00:00
parent 6d0f522af2
commit bf4ca1d681
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

2
src/osx/nonownedwnd_osx.cpp
View File

@ -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

2
src/osx/window_osx.cpp
View File

@ -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 )
{