X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..37ed592f7106e4ba483baa6fba91a9c481048bbc:/src/gtk/dcscreen.cpp?ds=inline diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp index 152c7c72cf..e32427f51e 100644 --- a/src/gtk/dcscreen.cpp +++ b/src/gtk/dcscreen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dcscreen.cpp +// Name: src/gtk/dcscreen.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,39 +11,42 @@ #include "wx/wxprec.h" #include "wx/dcscreen.h" -#include "wx/window.h" +#include "wx/gtk/dcscreen.h" + +#ifndef WX_PRECOMP + #include "wx/window.h" +#endif #include #include #include //----------------------------------------------------------------------------- -// global data initialization +// wxScreenDCImpl //----------------------------------------------------------------------------- -GdkWindow *wxScreenDC::sm_overlayWindow = (GdkWindow*) NULL; -int wxScreenDC::sm_overlayWindowX = 0; -int wxScreenDC::sm_overlayWindowY = 0; - -//----------------------------------------------------------------------------- -// wxScreenDC -//----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl) -IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC) +wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) + : wxWindowDCImpl( owner ) +{ + Init(); +} -wxScreenDC::wxScreenDC() +void wxScreenDCImpl::Init() { - m_ok = FALSE; + m_ok = false; m_cmap = gdk_colormap_get_system(); - m_window = GDK_ROOT_PARENT(); + m_gdkwindow = gdk_get_default_root_window(); -#ifdef __WXGTK20__ m_context = gdk_pango_context_get(); + // Note: The Sun customised version of Pango shipping with Solaris 10 + // crashes if the language is left NULL (see bug 1374114) + pango_context_set_language( m_context, gtk_get_default_language() ); m_layout = pango_layout_new( m_context ); // m_fontdesc = pango_font_description_copy( widget->style->font_desc ); -#endif - m_isScreenDC = TRUE; + m_isScreenDC = true; SetUpDC(); @@ -53,32 +56,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 * ) -{ - return true; -} - -bool wxScreenDC::StartDrawingOnTop( wxRect * ) -{ - return true; -} - -bool wxScreenDC::EndDrawingOnTop() -{ - return true; } -void wxScreenDC::DoGetSize(int *width, int *height) const +void wxScreenDCImpl::DoGetSize(int *width, int *height) const { wxDisplaySize(width, height); }