X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d2d8da1d89c195cb44f95f267989118e205c7bf..c91a2f7e67fae4278e2f931209aa386b5d67ae9d:/src/gtk/dcmemory.cpp diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp index 95bf5b9a8a..3c843eae1d 100644 --- a/src/gtk/dcmemory.cpp +++ b/src/gtk/dcmemory.cpp @@ -27,6 +27,12 @@ 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) ) @@ -35,6 +41,12 @@ 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() @@ -56,9 +68,9 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) m_window = m_selected.GetBitmap(); } - SetUpDC(); - m_isMemDC = TRUE; + + SetUpDC(); } else { @@ -67,44 +79,51 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) } } -void wxMemoryDC::SetPen( const wxPen &pen ) +void wxMemoryDC::SetPen( const wxPen& penOrig ) { - if (m_selected.Ok() && m_selected.GetBitmap() && (*wxTRANSPARENT_PEN != pen)) + wxPen pen( penOrig ); + if ( m_selected.Ok() && + m_selected.GetBitmap() && + (pen != *wxTRANSPARENT_PEN) ) { - if (*wxWHITE_PEN == pen) - wxWindowDC::SetPen( *wxBLACK_PEN ); - else - wxWindowDC::SetPen( *wxWHITE_PEN ); - } - else - { - wxWindowDC::SetPen( pen ); + pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE ); } + + wxWindowDC::SetPen( pen ); } -void wxMemoryDC::SetBrush( const wxBrush &brush ) +void wxMemoryDC::SetBrush( const wxBrush& brushOrig ) { - if (m_selected.Ok() && m_selected.GetBitmap() && (*wxTRANSPARENT_BRUSH != brush)) + wxBrush brush( brushOrig ); + if ( m_selected.Ok() && + m_selected.GetBitmap() && + (brush != *wxTRANSPARENT_BRUSH) ) { - if (*wxWHITE_BRUSH == brush) - wxWindowDC::SetBrush( *wxBLACK_BRUSH ); - else - wxWindowDC::SetBrush( *wxWHITE_BRUSH ); + brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE); } - else + + wxWindowDC::SetBrush( brush ); +} + +void wxMemoryDC::SetBackground( const wxBrush& brushOrig ) +{ + wxBrush brush(brushOrig); + + if ( m_selected.Ok() && + m_selected.GetBitmap() && + (brush != *wxTRANSPARENT_BRUSH) ) { - wxWindowDC::SetBrush( brush ); + brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE ); } + + wxWindowDC::SetBackground( brush ); } -void wxMemoryDC::SetTextForeground( const wxColour &col ) +void wxMemoryDC::SetTextForeground( const wxColour& col ) { - if (m_selected.Ok() && m_selected.GetBitmap()) + if ( m_selected.Ok() && m_selected.GetBitmap() ) { - if (col == *wxWHITE) - wxWindowDC::SetTextForeground( *wxBLACK ); - else - wxWindowDC::SetTextForeground( *wxWHITE ); + wxWindowDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE); } else { @@ -116,10 +135,7 @@ void wxMemoryDC::SetTextBackground( const wxColour &col ) { if (m_selected.Ok() && m_selected.GetBitmap()) { - if (col == *wxWHITE) - wxWindowDC::SetTextBackground( *wxBLACK ); - else - wxWindowDC::SetTextBackground( *wxWHITE ); + wxWindowDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE ); } else {