Updates for wxToolbook class

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index cab52977462d7be023bd0fa682e66b73a2271cbf..977e3d22fdcb30e93acb470926ad250b28a406fb 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcmemory.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,12 +26,6 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC()
     m_ok = FALSE;
 
     m_cmap = gtk_widget_get_default_colormap();
     m_ok = FALSE;
 
     m_cmap = gtk_widget_get_default_colormap();

-    
-#ifdef __WXGTK20__
-    m_context = gdk_pango_context_get();
-    m_layout = pango_layout_new( m_context );
-    m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
-#endif

 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )


@@ -44,19 +34,11 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
     m_ok = FALSE;
 
     m_cmap = gtk_widget_get_default_colormap();
     m_ok = FALSE;
 
     m_cmap = gtk_widget_get_default_colormap();

-    
-#ifdef __WXGTK20__
-    m_context = gdk_pango_context_get();
-    m_layout = pango_layout_new( m_context );
-    m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
-#endif
+

 }
 
 wxMemoryDC::~wxMemoryDC()
 {
 }
 
 wxMemoryDC::~wxMemoryDC()
 {

-#ifdef __WXGTK20__
-    g_object_unref(m_context);
-#endif

 }
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 }
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )


@@ -74,10 +56,6 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             m_window = m_selected.GetBitmap();
         }
 
             m_window = m_selected.GetBitmap();
         }
 

-#ifdef __WXGTK20__
-        m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
-#endif
-

         m_isMemDC = TRUE;
 
         SetUpDC();
         m_isMemDC = TRUE;
 
         SetUpDC();


@@ -115,7 +93,7 @@ void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
     wxWindowDC::SetBrush( brush );
 }
 
     wxWindowDC::SetBrush( brush );
 }
 

-void wxMemoryDC::SetBackground( const wxBrush& brushOrig ) 
+void wxMemoryDC::SetBackground( const wxBrush& brushOrig )

 {
     wxBrush brush(brushOrig);
 
 {
     wxBrush brush(brushOrig);