X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7452aff578453d1f94d68c101b897aed6b529b7d..c72b1ad70a0dda5a3fe5086e0c80ae12402e405d:/src/gtk1/dcmemory.cpp diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index a3ac365287..977e3d22fd 100644 --- a/src/gtk1/dcmemory.cpp +++ b/src/gtk1/dcmemory.cpp @@ -7,10 +7,6 @@ // 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" @@ -30,12 +26,6 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC() 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) ) @@ -44,12 +34,7 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) 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() @@ -71,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(); @@ -112,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);