bracketing msw enhanced metafile usage

[wxWidgets.git] / src / osx / utils_osx.cpp

diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp
index bd165782c5e6319728c3a5a1a3cfdc0b0eafdba4..251332d88cb70d2f1f1d0b7cf2fa4d324c94c295 100644 (file)
--- 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
 // 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
 /////////////////////////////////////////////////////////////////////////////
 // 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()
 {
 // Return true if we have a colour display
 bool wxColourDisplay()
 {

+    // always the case on OS X

     return true;
 }
 
     return true;
 }
 


@@ -97,7 +98,7 @@ bool wxLaunchDefaultApplication(const wxString& document, int flags)
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
     wxCFRef<CFURLRef> curl(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false));
     OSStatus err = LSOpenCFURLRef( curl , NULL );
     CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
     wxCFRef<CFURLRef> curl(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kCFURLPOSIXPathStyle, false));
     OSStatus err = LSOpenCFURLRef( curl , NULL );

-    
+

     if (err == noErr)
     {
         return true;
     if (err == noErr)
     {
         return true;


@@ -162,7 +163,6 @@ wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
     return new wxEventLoop;
 }
 
     return new wxEventLoop;
 }
 

-wxNonOwnedWindow *wxFindWindowFromWXWindow(WXWindow inWindowRef);

 wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt);
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 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 ) )
     {
 
     if ( FindWindow( screenPoint , &windowRef ) )
     {

-        wxNonOwnedWindow *nonOwned = wxFindWindowFromWXWindow( windowRef );
+        wxNonOwnedWindow *nonOwned = wxNonOwnedWindow::GetFromWXWindow( windowRef );

 
         if ( nonOwned )
             return wxFindWindowAtPoint( nonOwned , pt );
 
         if ( nonOwned )
             return wxFindWindowAtPoint( nonOwned , pt );