X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..7212d15556e87f73ff5ea8c3211a0e8e8811426b:/src/gtk1/dcmemory.cpp diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index 0ec10532b7..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$ @@ -7,10 +7,6 @@ // 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" @@ -27,29 +23,18 @@ 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(); - 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(); - m_layout = pango_layout_new( m_context ); - m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) ); -#endif + } wxMemoryDC::~wxMemoryDC() @@ -71,13 +56,13 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) m_window = m_selected.GetBitmap(); } - m_isMemDC = TRUE; + m_isMemDC = true; SetUpDC(); } else { - m_ok = FALSE; + m_ok = false; m_window = (GdkWindow *) NULL; } } @@ -108,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); @@ -159,5 +144,3 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const if (height) (*height) = 0; } } - -