Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

[wxWidgets.git] / src / x11 / dcmemory.cpp

diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index f5a4bddb6455fe576db0706f6c38d0f6ad1677ce..bdafb7aaf9778bbc39e143f1cfd9a7d27abc239f 100644 (file)
--- a/src/x11/dcmemory.cpp
+++ b/src/x11/dcmemory.cpp
@@ -20,25 +20,30 @@
 #endif
 
 #include "wx/x11/private.h"
 #endif
 
 #include "wx/x11/private.h"

+#include "wx/x11/dcmemory.h"

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl,wxWindowDCImpl)

 
 

-wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
-    : wxWindowDC()
+wxMemoryDCImpl::wxMemoryDCImpl( wxDC *owner )
+  : wxWindowDCImpl( owner )

 {
 {

-    m_ok = false;
-
-    m_display = (WXDisplay *) wxGlobalDisplay();
+    Init();
+}

 
 

-    int screen = DefaultScreen( wxGlobalDisplay() );
-    m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
+wxMemoryDCImpl::wxMemoryDCImpl(  wxDC *owner, wxBitmap& bitmap )
+  : wxWindowDCImpl( owner )
+{
+    Init();
+    DoSelect(bitmap);
+}

 
 

-    if ( bitmap.IsOk() )
-        SelectObject(bitmap);
+wxMemoryDCImpl::wxMemoryDCImpl( wxDC* owner, wxDC *WXUNUSED(dc) )
+  : wxWindowDCImpl( owner )
+{
+    Init();

 }
 
 }
 

-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
-  : wxWindowDC()
+void wxMemoryDCImpl::Init()

 {
     m_ok = false;
 
 {
     m_ok = false;
 


@@ -48,24 +53,24 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
     m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
 }
 
     m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
 }
 

-wxMemoryDC::~wxMemoryDC()
+wxMemoryDCImpl::~wxMemoryDCImpl()

 {
 }
 
 {
 }
 

-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )

 {
     Destroy();
 
     m_selected = bitmap;
 {
     Destroy();
 
     m_selected = bitmap;

-    if (m_selected.Ok())
+    if (m_selected.IsOk())

     {
         if (m_selected.GetPixmap())
         {
     {
         if (m_selected.GetPixmap())
         {

-            m_window = (WXWindow) m_selected.GetPixmap();
+            m_x11window = (WXWindow) m_selected.GetPixmap();

         }
         else
         {
         }
         else
         {

-            m_window = m_selected.GetBitmap();
+            m_x11window = m_selected.GetBitmap();

         }
 
         m_isMemDC = true;
         }
 
         m_isMemDC = true;


@@ -75,13 +80,13 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     else
     {
         m_ok = false;
     else
     {
         m_ok = false;

-        m_window = NULL;
+        m_x11window = NULL;

     }
 }
 
     }
 }
 

-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const

 {
 {

-    if (m_selected.Ok())
+    if (m_selected.IsOk())

     {
         if (width) (*width) = m_selected.GetWidth();
         if (height) (*height) = m_selected.GetHeight();
     {
         if (width) (*width) = m_selected.GetWidth();
         if (height) (*height) = m_selected.GetHeight();


@@ -92,3 +97,13 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (height) (*height) = 0;
     }
 }
         if (height) (*height) = 0;
     }
 }

+
+const wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() const
+{
+    return m_selected;
+}
+
+wxBitmap& wxMemoryDCImpl::GetSelectedBitmap()
+{
+    return m_selected;
+}