X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d257b8db10b5f464d896ff0d4249237d8f587a1..8071012d63f20d757554f9ed4b9cd3e789e5f0cd:/src/gtk1/dcmemory.cpp diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index 5d945a329f..977e3d22fd 100644 --- 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) ) @@ -44,19 +35,10 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) 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();