Applied patch from Ticket #9563. Use just the rectangle of the widget with the focus...

[wxWidgets.git] / src / gtk / dcscreen.cpp

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index 8e00545f96bc17c95d690dbd4e05895e9af073a7..e32427f51ebc85b92e72e04d1af082f5ac0d490b 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -11,6 +11,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"

+#include "wx/gtk/dcscreen.h"

 
 #ifndef WX_PRECOMP
     #include "wx/window.h"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"


@@ -21,24 +22,22 @@
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------

-// global data initialization
+// wxScreenDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-GdkWindow *wxScreenDC::sm_overlayWindow  = (GdkWindow*) NULL;
-int wxScreenDC::sm_overlayWindowX = 0;
-int wxScreenDC::sm_overlayWindowY = 0;
+IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)

 
 

-//-----------------------------------------------------------------------------
-// wxScreenDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC)
+wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) 
+  : wxWindowDCImpl( owner )
+{ 
+    Init(); 
+}

 
 

-wxScreenDC::wxScreenDC()
+void wxScreenDCImpl::Init()

 {
     m_ok = false;
     m_cmap = gdk_colormap_get_system();
 {
     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
 
     m_context = gdk_pango_context_get();
     // Note: The Sun customised version of Pango shipping with Solaris 10


@@ -57,32 +56,15 @@ wxScreenDC::wxScreenDC()
     gdk_gc_set_subwindow( m_bgGC, GDK_INCLUDE_INFERIORS );
 }
 
     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 );
 {
     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);
 }
 {
     wxDisplaySize(width, height);
 }