X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ea60735163ce5ae73b8f089b0a982e65853c9f8..29188693b3b8ba4b07762df012cc652d421dae79:/src/osx/utils_osx.cpp?ds=sidebyside diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp index bd165782c5..251332d88c 100644 --- a/src/osx/utils_osx.cpp +++ b/src/osx/utils_osx.cpp @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 -// RCS-ID: $Id: utils.cpp 54886 2008-07-31 13:02:53Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -61,6 +61,7 @@ bool wxCheckForInterrupt(wxWindow *WXUNUSED(wnd)) // Return true if we have a colour display bool wxColourDisplay() { + // always the case on OS X return true; } @@ -97,7 +98,7 @@ bool wxLaunchDefaultApplication(const wxString& document, int flags) CFStringNormalize(cfMutableString,kCFStringNormalizationFormD); wxCFRef curl(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false)); OSStatus err = LSOpenCFURLRef( curl , NULL ); - + if (err == noErr) { return true; @@ -162,7 +163,6 @@ wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() return new wxEventLoop; } -wxNonOwnedWindow *wxFindWindowFromWXWindow(WXWindow inWindowRef); wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt); wxWindow* wxFindWindowAtPoint(const wxPoint& pt) @@ -174,7 +174,7 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) if ( FindWindow( screenPoint , &windowRef ) ) { - wxNonOwnedWindow *nonOwned = wxFindWindowFromWXWindow( windowRef ); + wxNonOwnedWindow *nonOwned = wxNonOwnedWindow::GetFromWXWindow( windowRef ); if ( nonOwned ) return wxFindWindowAtPoint( nonOwned , pt );