X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..55410bb4f67febe1ca20654f078ea4fb9a6223ae:/src/gtk/dcmemory.cpp?ds=sidebyside diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp index c6ecf57072..e1ce88efa2 100644 --- a/src/gtk/dcmemory.cpp +++ b/src/gtk/dcmemory.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcmemory.cpp +// Name: src/gtk/dcmemory.cpp // Purpose: // Author: Robert Roebling // RCS-ID: $Id$ @@ -11,145 +11,132 @@ #include "wx/wxprec.h" #include "wx/dcmemory.h" +#include "wx/gtk/dcmemory.h" #include #include //----------------------------------------------------------------------------- -// wxMemoryDC +// wxMemoryDCImpl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC) +IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl) -wxMemoryDC::wxMemoryDC() : wxWindowDC() +wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) + : wxWindowDCImpl( owner ) +{ + Init(); +} + +wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap) + : wxWindowDCImpl( owner ) +{ + Init(); + DoSelect(bitmap); +} + +wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) ) + : wxWindowDCImpl( owner ) { - m_ok = FALSE; + Init(); +} - 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 +wxMemoryDCImpl::~wxMemoryDCImpl() +{ + g_object_unref(m_context); } -wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) - : wxWindowDC() +void wxMemoryDCImpl::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() -{ -#ifdef __WXGTK20__ - g_object_unref(m_context); -#endif -} - -void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) +void wxMemoryDCImpl::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(); - } - -#ifdef __WXGTK20__ - m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap); -#endif + m_gdkwindow = m_selected.GetPixmap(); - m_isMemDC = TRUE; + m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap); - SetUpDC(); + SetUpDC( true ); } else { - m_ok = FALSE; - m_window = (GdkWindow *) NULL; + m_ok = false; + m_gdkwindow = NULL; } } -void wxMemoryDC::SetPen( const wxPen& penOrig ) +void wxMemoryDCImpl::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 ); } - wxWindowDC::SetPen( pen ); + wxWindowDCImpl::SetPen( pen ); } -void wxMemoryDC::SetBrush( const wxBrush& brushOrig ) +void wxMemoryDCImpl::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); } - wxWindowDC::SetBrush( brush ); + wxWindowDCImpl::SetBrush( brush ); } -void wxMemoryDC::SetBackground( const wxBrush& brushOrig ) +void wxMemoryDCImpl::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 ); } - wxWindowDC::SetBackground( brush ); + wxWindowDCImpl::SetBackground( brush ); } -void wxMemoryDC::SetTextForeground( const wxColour& col ) +void wxMemoryDCImpl::SetTextForeground( const wxColour& col ) { - if ( m_selected.Ok() && m_selected.GetBitmap() ) - { - wxWindowDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE); - } + if ( m_selected.Ok() && m_selected.GetDepth() == 1 ) + wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE); else - { - wxWindowDC::SetTextForeground( col ); - } + wxWindowDCImpl::SetTextForeground( col ); } -void wxMemoryDC::SetTextBackground( const wxColour &col ) +void wxMemoryDCImpl::SetTextBackground( const wxColour &col ) { - if (m_selected.Ok() && m_selected.GetBitmap()) - { - wxWindowDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE ); - } + if (m_selected.Ok() && m_selected.GetDepth() == 1) + wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE ); else - { - wxWindowDC::SetTextBackground( col ); - } + wxWindowDCImpl::SetTextBackground( col ); } -void wxMemoryDC::DoGetSize( int *width, int *height ) const +void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const { if (m_selected.Ok()) { @@ -163,4 +150,19 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const } } +wxBitmap wxMemoryDCImpl::DoGetAsBitmap(const wxRect *subrect) const +{ + wxBitmap bmp = GetSelectedBitmap(); + return subrect ? bmp.GetSubBitmap(*subrect) : bmp; +} + +const wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() const +{ + return m_selected; +} + +wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() +{ + return m_selected; +}