X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..ce6d2511f82aafc78aba320018c868f826ab172b:/src/gtk1/dcmemory.cpp diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index 139438b215..5e81a54933 100644 --- a/src/gtk1/dcmemory.cpp +++ b/src/gtk1/dcmemory.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // RCS-ID: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -13,8 +13,8 @@ #include "wx/dcmemory.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // wxMemoryDC @@ -25,15 +25,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC) wxMemoryDC::wxMemoryDC() : wxWindowDC() { 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 = gtk_widget_get_default_colormap(); } @@ -54,19 +54,19 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) { m_window = m_selected.GetBitmap(); } - + SetUpDC(); - + m_isMemDC = TRUE; } 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()) {