return correct client area for at least the primary display, fixes the problems with...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index f4befaa0dc6fca1fba318dd82f65fa1d61523971..a01876821410cface3ee8d49a6d78b81ad304c08 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -66,6 +66,7 @@ wxMSW
 
 wxMac
 
+- Fix position of the centered windows (didn't take menu bar size into account)
 - Added support for the wxFRAME_FLOAT_ON_PARENT style.
 
 wxX11:

diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
index a69b111ae8a36cf6c0f64fbfa3ca6ba2c96f4161..3e9d8d50a15acfa6536b1373d780f2a9a5909a91 100644 (file)
--- a/src/mac/carbon/display.cpp
+++ b/src/mac/carbon/display.cpp
@@ -63,6 +63,7 @@ public:
     }
 
     virtual wxRect GetGeometry() const;
+    virtual wxRect GetClientArea() const;
     virtual wxString GetName() const { return wxString(); }
 
     virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
@@ -173,6 +174,17 @@ wxRect wxDisplayImplMacOSX::GetGeometry() const
                    (int)theRect.size.height ); //floats
 }
 
+wxRect wxDisplayImplMacOSX::GetClientArea() const
+{
+    // VZ: I don't know how to get client area for arbitrary display but
+    //     wxGetClientDisplayRect() does work correctly for at least the main
+    //     one (TODO: do it correctly for the other displays too)
+    if ( IsPrimary() )
+        return wxGetClientDisplayRect();
+
+    return wxDisplayImpl::GetClientArea();
+}
+
 static int wxCFDictKeyToInt( CFDictionaryRef desc, CFStringRef key )
 {
     CFNumberRef value = (CFNumberRef) CFDictionaryGetValue( desc, key );