Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DC reorganization

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-11-30 13:48:22 +00:00
parent 908eeca88d
commit 888dde65f4
85 changed files with 1831 additions and 2836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gtk/dcscreen.cpp
View File

@@ -11,6 +11,7 @@
#include "wx/wxprec.h"
#include "wx/dcscreen.h"
#include "wx/gtk/dcscreen.h"
#ifndef WX_PRECOMP
#include "wx/window.h"
@@ -20,36 +21,23 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// wxScreenDC
// wxScreenDCImpl
//-----------------------------------------------------------------------------
#if wxUSE_NEW_DC
IMPLEMENT_ABSTRACT_CLASS(wxGTKScreenImplDC, wxGTKWindowImplDC)
#else
IMPLEMENT_ABSTRACT_CLASS(wxScreenDC,wxWindowDC)
#endif
IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)
#if wxUSE_NEW_DC
wxGTKScreenImplDC::wxGTKScreenImplDC( wxScreenDC *owner )
: wxGTKWindowImplDC( owner )
wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner )
: wxWindowDCImpl( owner )
{
Init();
}
#else
wxScreenDC::wxScreenDC()
{
Init();
}
#endif
void wxGTKScreenImplDC::Init()
void wxScreenDCImpl::Init()
{
m_ok = false;
m_cmap = gdk_colormap_get_system();
m_window = gdk_get_default_root_window();
m_gdkwindow = gdk_get_default_root_window();
m_context = gdk_pango_context_get();
// Note: The Sun customised version of Pango shipping with Solaris 10
@@ -68,7 +56,7 @@ void wxGTKScreenImplDC::Init()
gdk_gc_set_subwindow( m_bgGC, GDK_INCLUDE_INFERIORS );
}
wxGTKScreenImplDC::~wxGTKScreenImplDC()
wxScreenDCImpl::~wxScreenDCImpl()
{
gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
gdk_gc_set_subwindow( m_brushGC, GDK_CLIP_BY_CHILDREN );
@@ -76,7 +64,7 @@ wxGTKScreenImplDC::~wxGTKScreenImplDC()
gdk_gc_set_subwindow( m_bgGC, GDK_CLIP_BY_CHILDREN );
}
void wxGTKScreenImplDC::DoGetSize(int *width, int *height) const
void wxScreenDCImpl::DoGetSize(int *width, int *height) const
{
wxDisplaySize(width, height);
}