X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..dc497201eb08e3de1402480e2ab97a6405335ecb:/src/gtk1/dcscreen.cpp?ds=sidebyside diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp index d313929559..dbd3a29229 100644 --- a/src/gtk1/dcscreen.cpp +++ b/src/gtk1/dcscreen.cpp @@ -4,13 +4,9 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "dcscreen.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -41,12 +37,6 @@ wxScreenDC::wxScreenDC() m_cmap = gdk_colormap_get_system(); m_window = GDK_ROOT_PARENT(); -#ifdef __WXGTK20__ - m_context = gdk_pango_context_get(); - m_layout = pango_layout_new( m_context ); -// m_fontdesc = pango_font_description_copy( widget->style->font_desc ); -#endif - m_isScreenDC = TRUE; SetUpDC(); @@ -67,47 +57,19 @@ 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