1945421 applied

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

diff --git a/src/mac/carbon/dcscreen.cpp b/src/mac/carbon/dcscreen.cpp
index 1de302dadeb0d7108d8f76185a0c1b78c70ebf51..ad8ac0be4a413b04a1b2f1dcf5f3358a3558c58d 100644 (file)
--- a/src/mac/carbon/dcscreen.cpp
+++ b/src/mac/carbon/dcscreen.cpp
@@ -12,19 +12,25 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"

+#include "wx/mac/carbon/dcscreen.h"

 
 #include "wx/mac/uma.h"
 #include "wx/graphics.h"
 
 
 #include "wx/mac/uma.h"
 #include "wx/graphics.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)

 
 // TODO : for the Screenshot use case, which doesn't work in Quartz
 // we should do a GetAsBitmap using something like
 // http://www.cocoabuilder.com/archive/message/cocoa/2005/8/13/144256
 
 // Create a DC representing the whole screen
 
 // TODO : for the Screenshot use case, which doesn't work in Quartz
 // we should do a GetAsBitmap using something like
 // http://www.cocoabuilder.com/archive/message/cocoa/2005/8/13/144256
 
 // Create a DC representing the whole screen

-wxScreenDC::wxScreenDC()
+wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) :
+   wxWindowDCImpl( owner )

 {
 {

+#ifdef __LP64__
+    m_graphicContext = NULL;
+    m_ok = false ;
+#else

     CGRect cgbounds ;
     cgbounds = CGDisplayBounds(CGMainDisplayID());
     Rect bounds;
     CGRect cgbounds ;
     cgbounds = CGDisplayBounds(CGMainDisplayID());
     Rect bounds;


@@ -39,11 +45,15 @@ wxScreenDC::wxScreenDC()
     m_width = (wxCoord)cgbounds.size.width;
     m_height = (wxCoord)cgbounds.size.height;
     m_ok = true ;
     m_width = (wxCoord)cgbounds.size.width;
     m_height = (wxCoord)cgbounds.size.height;
     m_ok = true ;

+#endif

 }
 
 }
 

-wxScreenDC::~wxScreenDC()
+wxScreenDCImpl::~wxScreenDCImpl()

 {
     delete m_graphicContext;
     m_graphicContext = NULL;
 {
     delete m_graphicContext;
     m_graphicContext = NULL;

+#ifdef __LP64__
+#else

     DisposeWindow((WindowRef) m_overlayWindow );
     DisposeWindow((WindowRef) m_overlayWindow );

+#endif

 }
 }