X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d25c05039a7c6ebbddfe16d99234dc756e75356..a70d268a1b43dc8ef2025b2beaeb5a595ba173fc:/src/gtk1/dcscreen.cpp diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp index 825cd2b2de..1cff4e457f 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,37 +7,43 @@ // 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 #include +#include "wx/dcscreen.h" +#include "wx/gtk1/dcscreen.h" + //----------------------------------------------------------------------------- // global data initialization //----------------------------------------------------------------------------- -GdkWindow *wxScreenDC::sm_overlayWindow = (GdkWindow*) NULL; -int wxScreenDC::sm_overlayWindowX = 0; -int wxScreenDC::sm_overlayWindowY = 0; +GdkWindow *wxScreenDCImpl::sm_overlayWindow = NULL; +int wxScreenDCImpl::sm_overlayWindowX = 0; +int wxScreenDCImpl::sm_overlayWindowY = 0; //----------------------------------------------------------------------------- -// wxScreenDC +// wxScreenDCImpl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC) +IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxPaintDCImpl) -wxScreenDC::wxScreenDC() +wxScreenDCImpl::wxScreenDCImpl(wxScreenDC *owner) + : wxPaintDCImpl(owner) { - m_ok = FALSE; + m_ok = false; m_cmap = gdk_colormap_get_system(); m_window = GDK_ROOT_PARENT(); + m_isScreenDC = true; + SetUpDC(); gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS ); @@ -46,56 +52,15 @@ wxScreenDC::wxScreenDC() gdk_gc_set_subwindow( m_bgGC, GDK_INCLUDE_INFERIORS ); } -wxScreenDC::~wxScreenDC() +wxScreenDCImpl::~wxScreenDCImpl() { gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN ); gdk_gc_set_subwindow( m_brushGC, GDK_CLIP_BY_CHILDREN ); gdk_gc_set_subwindow( m_textGC, GDK_CLIP_BY_CHILDREN ); gdk_gc_set_subwindow( m_bgGC, GDK_CLIP_BY_CHILDREN ); - - EndDrawingOnTop(); -} - -bool wxScreenDC::StartDrawingOnTop( wxWindow *window ) -{ - 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 ); } -bool wxScreenDC::StartDrawingOnTop( wxRect *rect ) +void wxScreenDCImpl::DoGetSize(int *width, int *height) const { - 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; + wxDisplaySize(width, height); } - -bool wxScreenDC::EndDrawingOnTop() -{ - return TRUE; -} -