X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/203b65dd29ad224968b9d7dbb227cecaeec5568c..848332140be2d53aea32d0702f4c0e06c149d24b:/src/gtk1/dcmemory.cpp diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index ee801a6f56..977e3d22fd 100644 --- a/src/gtk1/dcmemory.cpp +++ b/src/gtk1/dcmemory.cpp @@ -26,13 +26,6 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC() 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( wxDC *WXUNUSED(dc) ) @@ -41,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 ) @@ -72,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(); @@ -113,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);