X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90d93d1b4eac787f51ed6ad7584cd4d106a745b..f8a139493553049e0b92db4bbee11deb33093ee3:/src/gtk1/dcmemory.cpp?ds=inline diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index 768465ba8c..713e58e881 100644 --- a/src/gtk1/dcmemory.cpp +++ b/src/gtk1/dcmemory.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcmemory.cpp +// Name: src/gtk1/dcmemory.cpp // Purpose: // Author: Robert Roebling // RCS-ID: $Id$ @@ -23,40 +23,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC) wxMemoryDC::wxMemoryDC() : wxWindowDC() { - m_ok = FALSE; + 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) ) - : wxWindowDC() + : wxWindowDC() { - m_ok = FALSE; + 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,17 +56,13 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) m_window = m_selected.GetBitmap(); } -#ifdef __WXGTK20__ - m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap); -#endif - - m_isMemDC = TRUE; + m_isMemDC = true; SetUpDC(); } else { - m_ok = FALSE; + m_ok = false; m_window = (GdkWindow *) NULL; } } @@ -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); @@ -166,5 +144,3 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const if (height) (*height) = 0; } } - -