X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..a3736ef475f212f1f7b07c36278ba83d7511406c:/src/gtk/dcmemory.cpp diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp index 84a6e144e7..6e6365b3ea 100644 --- a/src/gtk/dcmemory.cpp +++ b/src/gtk/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 ///////////////////////////////////////////////////////////////////////////// @@ -14,79 +13,71 @@ #include "wx/dcmemory.h" -#ifdef wxUSE_GDK_IMLIB -#include "../gdk_imlib/gdk_imlib.h" -#endif +#include "gdk/gdk.h" +#include "gtk/gtk.h" //----------------------------------------------------------------------------- // wxMemoryDC //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC) +IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC) -wxMemoryDC::wxMemoryDC(void) +wxMemoryDC::wxMemoryDC() : wxWindowDC() { - m_ok = FALSE; + m_ok = FALSE; -#ifdef wxUSE_GDK_IMLIB - m_cmap = gdk_imlib_get_colormap(); -#else - m_cmap = gdk_colormap_get_system(); -#endif + m_cmap = gtk_widget_get_default_colormap(); } -wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) +wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) + : wxWindowDC() { - m_ok = FALSE; + m_ok = FALSE; -#ifdef wxUSE_GDK_IMLIB - m_cmap = gdk_imlib_get_colormap(); -#else - m_cmap = gdk_colormap_get_system(); -#endif + 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 = (GdkWindow *) NULL; - } } -void wxMemoryDC::GetSize( int *width, int *height ) const +void wxMemoryDC::DoGetSize( 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; + } }