fixing osx_cocoa

[wxWidgets.git] / src / common / dpycmn.cpp

diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index aa4f5e0533c08adad3081f4f5c759be97ad9ee00..0087b7d09f6c9a1770163ca7d698cccc3b1f357a 100644 (file)
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -6,7 +6,7 @@
 // Created:     01.03.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003-2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     01.03.03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003-2006 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -98,11 +98,7 @@ public:
     virtual bool OnInit() { return true; }
     virtual void OnExit()
     {
     virtual bool OnInit() { return true; }
     virtual void OnExit()
     {

-        if ( gs_factory )
-        {
-            delete gs_factory;
-            gs_factory = NULL;
-        }
+        wxDELETE(gs_factory);

     }
 
     DECLARE_DYNAMIC_CLASS(wxDisplayModule)
     }
 
     DECLARE_DYNAMIC_CLASS(wxDisplayModule)


@@ -238,7 +234,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
 int wxDisplayFactory::GetFromWindow(const wxWindow *window)
 {
     // consider that the window belongs to the display containing its centre
 int wxDisplayFactory::GetFromWindow(const wxWindow *window)
 {
     // consider that the window belongs to the display containing its centre

-    const wxRect r(window->GetRect());
+    const wxRect r(window->GetScreenRect());

     return GetFromPoint(wxPoint(r.x + r.width/2, r.y + r.height/2));
 }
 
     return GetFromPoint(wxPoint(r.x + r.width/2, r.y + r.height/2));
 }