Patch 1709108

[wxWidgets.git] / src / mac / carbon / display.cpp

diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
index 79c727f1f10ff95fed73452bf2c78f7930030d41..3e9d8d50a15acfa6536b1373d780f2a9a5909a91 100644 (file)
--- a/src/mac/carbon/display.cpp
+++ b/src/mac/carbon/display.cpp
@@ -25,9 +25,13 @@
 
 #if wxUSE_DISPLAY
 
 
 #if wxUSE_DISPLAY
 

+#include "wx/display.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-   #include "wx/dynarray.h"
-   #include "wx/log.h"
+    #include "wx/dynarray.h"
+    #include "wx/log.h"
+    #include "wx/string.h"
+    #include "wx/gdicmn.h"

 #endif
 
 #ifdef __DARWIN__
 #endif
 
 #ifdef __DARWIN__


@@ -41,10 +45,7 @@
     #include <Debugging.h>
 #endif
 
     #include <Debugging.h>
 #endif
 

-#include "wx/display.h"

 #include "wx/display_impl.h"
 #include "wx/display_impl.h"

-#include "wx/gdicmn.h"
-#include "wx/string.h"

 
 // ----------------------------------------------------------------------------
 // display classes implementation
 
 // ----------------------------------------------------------------------------
 // display classes implementation


@@ -55,9 +56,14 @@
 class wxDisplayImplMacOSX : public wxDisplayImpl
 {
 public:
 class wxDisplayImplMacOSX : public wxDisplayImpl
 {
 public:

-    wxDisplayImplMacOSX(CGDirectDisplayID id) : m_id(id) { }
+    wxDisplayImplMacOSX(unsigned n, CGDirectDisplayID id)
+        : wxDisplayImpl(n),
+          m_id(id)
+    {
+    }

 
     virtual wxRect GetGeometry() const;
 
     virtual wxRect GetGeometry() const;

+    virtual wxRect GetClientArea() const;

     virtual wxString GetName() const { return wxString(); }
 
     virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
     virtual wxString GetName() const { return wxString(); }
 
     virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;


@@ -73,10 +79,10 @@ private:
 class wxDisplayFactoryMacOSX : public wxDisplayFactory
 {
 public:
 class wxDisplayFactoryMacOSX : public wxDisplayFactory
 {
 public:

-    wxDisplayFactoryMacOSX();
+    wxDisplayFactoryMacOSX() {}

 
 

-    virtual wxDisplayImpl *CreateDisplay(size_t n);
-    virtual size_t GetCount();
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);
+    virtual unsigned GetCount();

     virtual int GetFromPoint(const wxPoint& pt);
 
 protected:
     virtual int GetFromPoint(const wxPoint& pt);
 
 protected:


@@ -87,7 +93,7 @@ protected:
 // wxDisplayFactoryMacOSX implementation
 // ============================================================================
 
 // wxDisplayFactoryMacOSX implementation
 // ============================================================================
 

-size_t wxDisplayFactoryMacOSX::GetCount()
+unsigned wxDisplayFactoryMacOSX::GetCount()

 {
     CGDisplayCount count;
 #ifdef __WXDEBUG__
 {
     CGDisplayCount count;
 #ifdef __WXDEBUG__


@@ -135,7 +141,7 @@ int wxDisplayFactoryMacOSX::GetFromPoint(const wxPoint& p)
     return nWhich;
 }
 
     return nWhich;
 }
 

-wxDisplayImpl *wxDisplayFactoryMacOSX::CreateDisplay(size_t n)
+wxDisplayImpl *wxDisplayFactoryMacOSX::CreateDisplay(unsigned n)

 {
     CGDisplayCount theCount = GetCount();
     CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];
 {
     CGDisplayCount theCount = GetCount();
     CGDirectDisplayID* theIDs = new CGDirectDisplayID[theCount];


@@ -148,7 +154,7 @@ wxDisplayImpl *wxDisplayFactoryMacOSX::CreateDisplay(size_t n)
     wxASSERT( err == CGDisplayNoErr );
     wxASSERT( n < theCount );
 
     wxASSERT( err == CGDisplayNoErr );
     wxASSERT( n < theCount );
 

-    wxDisplayImplMacOSX *display = new wxDisplayImplMacOSX(theIDs[n]);
+    wxDisplayImplMacOSX *display = new wxDisplayImplMacOSX(n, theIDs[n]);

 
     delete [] theIDs;
 
 
     delete [] theIDs;
 


@@ -168,6 +174,17 @@ wxRect wxDisplayImplMacOSX::GetGeometry() const
                    (int)theRect.size.height ); //floats
 }
 
                    (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 );
 static int wxCFDictKeyToInt( CFDictionaryRef desc, CFStringRef key )
 {
     CFNumberRef value = (CFNumberRef) CFDictionaryGetValue( desc, key );


@@ -251,7 +268,11 @@ bool wxDisplayImplMacOSX::ChangeMode( const wxVideoMode& mode )
 class wxDisplayImplMac : public wxDisplayImpl
 {
 public:
 class wxDisplayImplMac : public wxDisplayImpl
 {
 public:

-    wxDisplayImplMac(GDHandle hndl) : m_hndl(hndl) { }
+    wxDisplayImplMac(unsigned n, GDHandle hndl)
+        : wxDisplayImpl(n),
+          m_hndl(hndl)
+    {
+    }

 
     virtual wxRect GetGeometry() const;
     virtual wxString GetName() const { return wxString(); }
 
     virtual wxRect GetGeometry() const;
     virtual wxString GetName() const { return wxString(); }


@@ -271,8 +292,8 @@ class wxDisplayFactoryMac : public wxDisplayFactory
 public:
     wxDisplayFactoryMac();
 
 public:
     wxDisplayFactoryMac();
 

-    virtual wxDisplayImpl *CreateDisplay(size_t n);
-    virtual size_t GetCount();
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);
+    virtual unsigned GetCount();

     virtual int GetFromPoint(const wxPoint& pt);
 
 protected:
     virtual int GetFromPoint(const wxPoint& pt);
 
 protected:


@@ -283,9 +304,9 @@ protected:
 // wxDisplayFactoryMac implementation
 // ============================================================================
 
 // wxDisplayFactoryMac implementation
 // ============================================================================
 

-size_t wxDisplayFactoryMac::GetCount()
+unsigned wxDisplayFactoryMac::GetCount()

 {
 {

-    size_t num = 0;
+    unsigned num = 0;

     GDHandle hndl = DMGetFirstScreenDevice(true);
     while(hndl)
     {
     GDHandle hndl = DMGetFirstScreenDevice(true);
     while(hndl)
     {


@@ -297,7 +318,7 @@ size_t wxDisplayFactoryMac::GetCount()
 
 int wxDisplayFactoryMac::GetFromPoint(const wxPoint &p)
 {
 
 int wxDisplayFactoryMac::GetFromPoint(const wxPoint &p)
 {

-    size_t num = 0;
+    unsigned num = 0;

     GDHandle hndl = DMGetFirstScreenDevice(true);
     while(hndl)
     {
     GDHandle hndl = DMGetFirstScreenDevice(true);
     while(hndl)
     {


@@ -316,14 +337,16 @@ int wxDisplayFactoryMac::GetFromPoint(const wxPoint &p)
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-wxDisplayImpl *wxDisplayFactoryMac::CreateDisplay(size_t n)
+wxDisplayImpl *wxDisplayFactoryMac::CreateDisplay(unsigned n)

 {
 {

+    unsigned nOrig = n;
+

     GDHandle hndl = DMGetFirstScreenDevice(true);
     while(hndl)
     {
         if (n == 0)
         {
     GDHandle hndl = DMGetFirstScreenDevice(true);
     while(hndl)
     {
         if (n == 0)
         {

-            return new wxDisplayImplMac(hndl);
+            return new wxDisplayImplMac(nOrig, hndl);

         }
         n--;
         hndl = DMGetNextScreenDevice(hndl, true);
         }
         n--;
         hndl = DMGetNextScreenDevice(hndl, true);