Fixed OpenWatcom (strange) scope related crash.

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

diff --git a/src/mac/classic/display.cpp b/src/mac/classic/display.cpp
index 61eb2d44e2f4107d0faf55d30af30c2517573dcc..f216f1fd65d696d59875cc69546193cf4b9a36af 100644 (file)
--- a/src/mac/classic/display.cpp
+++ b/src/mac/classic/display.cpp
@@ -26,9 +26,12 @@
 
 #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"

 #endif
 
 #ifdef __DARWIN__
 #endif
 
 #ifdef __DARWIN__


@@ -41,10 +44,8 @@
     #include <FixMath.h>
 #endif
 
     #include <FixMath.h>
 #endif
 

-#include "wx/display.h"

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

-#include "wx/string.h"

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


@@ -53,7 +54,11 @@
 class wxDisplayImplMac : public wxDisplayImpl
 {
 public:
 class wxDisplayImplMac : public wxDisplayImpl
 {
 public:

-    wxDisplayImplMac(GDHandle hndl) : m_hndl(hndl) { }
+    wxDisplayImplMac(size_t 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(); }


@@ -120,12 +125,14 @@ int wxDisplayFactoryMac::GetFromPoint(const wxPoint &p)
 
 wxDisplayImpl *wxDisplayFactoryMac::CreateDisplay(size_t n)
 {
 
 wxDisplayImpl *wxDisplayFactoryMac::CreateDisplay(size_t n)
 {

+    size_t 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);