X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1208c3103734c8581c9854c344b97323e381897..677dc0ed1a3ff68af15f6246d6d0708d5264b07a:/src/gtk1/dcscreen.cpp diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp index 51a09f4806..7797f94394 100644 --- a/src/gtk1/dcscreen.cpp +++ b/src/gtk1/dcscreen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcscreen.cpp +// Name: src/gtk1/dcscreen.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,12 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dcscreen.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/dcscreen.h" -#include "wx/window.h" + +#ifndef WX_PRECOMP + #include "wx/window.h" +#endif #include #include @@ -34,11 +36,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC) wxScreenDC::wxScreenDC() { - m_ok = FALSE; + m_ok = false; m_cmap = gdk_colormap_get_system(); m_window = GDK_ROOT_PARENT(); - m_isScreenDC = TRUE; + m_isScreenDC = true; SetUpDC(); @@ -58,46 +60,22 @@ wxScreenDC::~wxScreenDC() EndDrawingOnTop(); } -bool wxScreenDC::StartDrawingOnTop( wxWindow *window ) +bool wxScreenDC::StartDrawingOnTop( wxWindow * ) { - if (!window) return StartDrawingOnTop(); - - int x = 0; - int y = 0; - window->GetPosition( &x, &y ); - int w = 0; - int h = 0; - window->GetSize( &w, &h ); - window->ClientToScreen( &x, &y ); - - wxRect rect; - rect.x = x; - rect.y = y; - rect.width = 0; - rect.height = 0; - - return StartDrawingOnTop( &rect ); + return true; } -bool wxScreenDC::StartDrawingOnTop( wxRect *rect ) +bool wxScreenDC::StartDrawingOnTop( wxRect * ) { - int x = 0; - int y = 0; - int width = gdk_screen_width(); - int height = gdk_screen_height(); - if (rect) - { - x = rect->x; - y = rect->y; - width = rect->width; - height = rect->height; - } - - return TRUE; + return true; } bool wxScreenDC::EndDrawingOnTop() { - return TRUE; + return true; } +void wxScreenDC::DoGetSize(int *width, int *height) const +{ + wxDisplaySize(width, height); +}