[ 1578466 ] Support for custom floating panes

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

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index e5063b5ed844a34657443fc7d2ac99efb4790ea0..84ac42aa3c6ec51975dfad184a1cae4130d60074 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/dc.h"
 #endif
 
 #include "wx/dc.h"

+#include "wx/dcbuffer.h" // for IMPLEMENT_DYNAMIC_CLASS

 
 #ifndef WX_PRECOMP
     #include "wx/math.h"
 
 #ifndef WX_PRECOMP
     #include "wx/math.h"


@@ -38,6 +39,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+IMPLEMENT_DYNAMIC_CLASS(wxBufferedDC, wxMemoryDC)
+IMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC, wxBufferedDC)
+

 #if WXWIN_COMPATIBILITY_2_6
 void wxDCBase::BeginDrawing()
 {
 #if WXWIN_COMPATIBILITY_2_6
 void wxDCBase::BeginDrawing()
 {


@@ -1256,8 +1260,9 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
     
     OSStatus err = CreateOverlayWindow();
     wxASSERT_MSG(  err == noErr , _("Couldn't create the overlay window") );
     
     OSStatus err = CreateOverlayWindow();
     wxASSERT_MSG(  err == noErr , _("Couldn't create the overlay window") );

-
+#ifndef __LP64__

     err = QDBeginCGContext(GetWindowPort(m_overlayWindow), &m_overlayContext);
     err = QDBeginCGContext(GetWindowPort(m_overlayWindow), &m_overlayContext);

+#endif

     CGContextTranslateCTM( m_overlayContext, 0, m_height+m_y );
     CGContextScaleCTM( m_overlayContext, 1, -1 );
     wxASSERT_MSG(  err == noErr , _("Couldn't init the context on the overlay window") );
     CGContextTranslateCTM( m_overlayContext, 0, m_height+m_y );
     CGContextScaleCTM( m_overlayContext, 1, -1 );
     wxASSERT_MSG(  err == noErr , _("Couldn't init the context on the overlay window") );


@@ -1294,9 +1299,10 @@ void wxOverlayImpl::Reset()
 {
     if ( m_overlayContext )
     {
 {
     if ( m_overlayContext )
     {

+#ifndef __LP64__

         OSStatus err = QDEndCGContext(GetWindowPort(m_overlayWindow), &m_overlayContext);
         wxASSERT_MSG(  err == noErr , _("Couldn't end the context on the overlay window") );
         OSStatus err = QDEndCGContext(GetWindowPort(m_overlayWindow), &m_overlayContext);
         wxASSERT_MSG(  err == noErr , _("Couldn't end the context on the overlay window") );

-
+#endif

         m_overlayContext = NULL ;
     }    
     
         m_overlayContext = NULL ;
     }