X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..8ca1a013e4e699724040ff1f514dab3b4a11d3c9:/src/gtk/dcmemory.cpp?ds=sidebyside diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp index 7a923753f7..47c9a673f5 100644 --- a/src/gtk/dcmemory.cpp +++ b/src/gtk/dcmemory.cpp @@ -1,16 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcmemory.cpp +// Name: src/gtk/dcmemory.cpp // Purpose: // Author: Robert Roebling // RCS-ID: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWidgets licence +// 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" @@ -25,59 +21,49 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC) -wxMemoryDC::wxMemoryDC() : wxWindowDC() +void wxMemoryDC::Init() { - 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() { - 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 + Init(); } wxMemoryDC::~wxMemoryDC() { + g_object_unref(m_context); } -void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) +void wxMemoryDC::DoSelect( const wxBitmap& bitmap ) { Destroy(); + m_selected = bitmap; if (m_selected.Ok()) { - if (m_selected.GetPixmap()) - { - m_window = m_selected.GetPixmap(); - } - else - { - m_window = m_selected.GetBitmap(); - } + m_window = m_selected.GetPixmap(); + + m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap); - m_isMemDC = TRUE; + m_isMemDC = true; SetUpDC(); } else { - m_ok = FALSE; + m_ok = false; m_window = (GdkWindow *) NULL; } } @@ -86,7 +72,7 @@ void wxMemoryDC::SetPen( const wxPen& penOrig ) { wxPen pen( penOrig ); if ( m_selected.Ok() && - m_selected.GetBitmap() && + m_selected.GetDepth() == 1 && (pen != *wxTRANSPARENT_PEN) ) { pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE ); @@ -99,7 +85,7 @@ void wxMemoryDC::SetBrush( const wxBrush& brushOrig ) { wxBrush brush( brushOrig ); if ( m_selected.Ok() && - m_selected.GetBitmap() && + m_selected.GetDepth() == 1 && (brush != *wxTRANSPARENT_BRUSH) ) { brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE); @@ -108,12 +94,12 @@ void wxMemoryDC::SetBrush( const wxBrush& brushOrig ) wxWindowDC::SetBrush( brush ); } -void wxMemoryDC::SetBackground( const wxBrush& brushOrig ) +void wxMemoryDC::SetBackground( const wxBrush& brushOrig ) { wxBrush brush(brushOrig); if ( m_selected.Ok() && - m_selected.GetBitmap() && + m_selected.GetDepth() == 1 && (brush != *wxTRANSPARENT_BRUSH) ) { brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE ); @@ -124,7 +110,7 @@ void wxMemoryDC::SetBackground( const wxBrush& brushOrig ) void wxMemoryDC::SetTextForeground( const wxColour& col ) { - if ( m_selected.Ok() && m_selected.GetBitmap() ) + if ( m_selected.Ok() && m_selected.GetDepth() == 1 ) { wxWindowDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE); } @@ -136,7 +122,7 @@ void wxMemoryDC::SetTextForeground( const wxColour& col ) void wxMemoryDC::SetTextBackground( const wxColour &col ) { - if (m_selected.Ok() && m_selected.GetBitmap()) + if (m_selected.Ok() && m_selected.GetDepth() == 1) { wxWindowDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE ); } @@ -159,5 +145,3 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const if (height) (*height) = 0; } } - -