ignore WinCE projects and build directories

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index a27cce10412dd96bc01d375566dac33c85e500ca..3d865283d2d1af0feda66b0907ece00d1fe85bad 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -10,35 +10,35 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/dcmemory.h"
+#include "wx/gtk1/dcmemory.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
-// wxMemoryDC
+// wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)
 
-void wxMemoryDC::Init()
+void wxMemoryDCImpl::Init()
 {
     m_ok = false;
 
     m_cmap = gtk_widget_get_default_colormap();
 }
 
-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
-          : wxWindowDC()
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *WXUNUSED(dc))
+              : wxWindowDCImpl(owner)
 {
     Init();
 }
 
-wxMemoryDC::~wxMemoryDC()
+wxMemoryDCImpl::~wxMemoryDCImpl()
 {
 }
 
-void wxMemoryDC::DoSelect( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
 {
     Destroy();
 
@@ -65,7 +65,7 @@ void wxMemoryDC::DoSelect( const wxBitmap& bitmap )
     }
 }
 
-void wxMemoryDC::SetPen( const wxPen& penOrig )
+void wxMemoryDCImpl::SetPen( const wxPen& penOrig )
 {
     wxPen pen( penOrig );
     if ( m_selected.Ok() &&
@@ -75,10 +75,10 @@ void wxMemoryDC::SetPen( const wxPen& penOrig )
         pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 
-    wxWindowDC::SetPen( pen );
+    wxWindowDCImpl::SetPen( pen );
 }
 
-void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
+void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig )
 {
     wxBrush brush( brushOrig );
     if ( m_selected.Ok() &&
@@ -88,10 +88,10 @@ void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
     }
 
-    wxWindowDC::SetBrush( brush );
+    wxWindowDCImpl::SetBrush( brush );
 }
 
-void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
+void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig )
 {
     wxBrush brush(brushOrig);
 
@@ -102,34 +102,34 @@ void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
 
-    wxWindowDC::SetBackground( brush );
+    wxWindowDCImpl::SetBackground( brush );
 }
 
-void wxMemoryDC::SetTextForeground( const wxColour& col )
+void wxMemoryDCImpl::SetTextForeground( const wxColour& col )
 {
     if ( m_selected.Ok() && m_selected.GetBitmap() )
     {
-        wxWindowDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
+        wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
     }
     else
     {
-        wxWindowDC::SetTextForeground( col );
+        wxWindowDCImpl::SetTextForeground( col );
     }
 }
 
-void wxMemoryDC::SetTextBackground( const wxColour &col )
+void wxMemoryDCImpl::SetTextBackground( const wxColour &col )
 {
     if (m_selected.Ok() && m_selected.GetBitmap())
     {
-        wxWindowDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
+        wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
     else
     {
-        wxWindowDC::SetTextBackground( col );
+        wxWindowDCImpl::SetTextBackground( col );
     }
 }
 
-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
 {
     if (m_selected.Ok())
     {