X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0180d5daae8187ca9d938a1aa07e54ac16a12d1a..e487524e492809638b7e335937c41fd432458a54:/src/gtk1/dcmemory.cpp diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index 66c5549f52..e996334c00 100644 --- a/src/gtk1/dcmemory.cpp +++ b/src/gtk1/dcmemory.cpp @@ -2,9 +2,8 @@ // Name: dcmemory.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,61 +17,64 @@ // wxMemoryDC //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC) +IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC) -wxMemoryDC::wxMemoryDC(void) +wxMemoryDC::wxMemoryDC() : wxWindowDC() { - m_ok = FALSE; - m_cmap = gdk_colormap_get_system(); -}; + m_ok = FALSE; + + m_cmap = gtk_widget_get_default_colormap(); +} -wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) +wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) + : wxWindowDC() { - m_ok = FALSE; - m_cmap = gdk_colormap_get_system(); -}; + m_ok = FALSE; + + m_cmap = gtk_widget_get_default_colormap(); +} -wxMemoryDC::~wxMemoryDC(void) +wxMemoryDC::~wxMemoryDC() { -}; +} void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) { - m_selected = bitmap; - if (m_selected.Ok()) - { - if (m_selected.GetPixmap()) + m_selected = bitmap; + if (m_selected.Ok()) { - m_window = m_selected.GetPixmap(); + if (m_selected.GetPixmap()) + { + m_window = m_selected.GetPixmap(); + } + else + { + m_window = m_selected.GetBitmap(); + } + + SetUpDC(); + + m_isMemDC = TRUE; } else - { - m_window = m_selected.GetBitmap(); + { + m_ok = FALSE; + m_window = (GdkWindow *) NULL; } - - SetUpDC(); - - m_isDrawable = FALSE; - } - else - { - m_ok = FALSE; - m_window = NULL; - }; -}; +} void wxMemoryDC::GetSize( int *width, int *height ) const { - if (m_selected.Ok()) - { - if (width) (*width) = m_selected.GetWidth(); - if (height) (*height) = m_selected.GetHeight(); - } - else - { - if (width) (*width) = 0; - if (height) (*height) = 0; - }; -}; + if (m_selected.Ok()) + { + if (width) (*width) = m_selected.GetWidth(); + if (height) (*height) = m_selected.GetHeight(); + } + else + { + if (width) (*width) = 0; + if (height) (*height) = 0; + } +}