Include wx/frame.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 768465ba8cc4f4f46ae5bf78a0f85c10f35e5c0f..977e3d22fdcb30e93acb470926ad250b28a406fb 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -26,15 +26,6 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC()
     m_ok = FALSE;
 
     m_cmap = gtk_widget_get_default_colormap();
-    
-#ifdef __WXGTK20__
-    m_context = gdk_pango_context_get();
-    // Note: The Sun customised version of Pango shipping with Solaris 10
-    // crashes if the language is left NULL (see bug 1374114)
-    pango_context_set_language( m_context, gtk_get_default_language() );
-    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) )
@@ -43,20 +34,11 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
     m_ok = FALSE;
 
     m_cmap = gtk_widget_get_default_colormap();
-    
-#ifdef __WXGTK20__
-    m_context = gdk_pango_context_get();
-    pango_context_set_language( m_context, gtk_get_default_language() );
-    m_layout = pango_layout_new( m_context );
-    m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
-#endif
+
 }
 
 wxMemoryDC::~wxMemoryDC()
 {
-#ifdef __WXGTK20__
-    g_object_unref(m_context);
-#endif
 }
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
@@ -74,10 +56,6 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             m_window = m_selected.GetBitmap();
         }
 
-#ifdef __WXGTK20__
-        m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
-#endif
-
         m_isMemDC = TRUE;
 
         SetUpDC();
@@ -115,7 +93,7 @@ void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
     wxWindowDC::SetBrush( brush );
 }
 
-void wxMemoryDC::SetBackground( const wxBrush& brushOrig ) 
+void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
 {
     wxBrush brush(brushOrig);