always call GTKSetActivatesDefault(), not only if wxTE_PROCESS_ENTER style was given...

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

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index bf7d10404d15f9abdee6c89f87635735d97587c2..98832256200d0acb9cfbe40a973007f1794ffbb5 100644 (file)
--- 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,42 +11,54 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
-//-----------------------------------------------------------------------------
-// global data initialization
-//-----------------------------------------------------------------------------
-
-GdkWindow *wxScreenDC::sm_overlayWindow  = (GdkWindow*) NULL;
-int wxScreenDC::sm_overlayWindowX = 0;
-int wxScreenDC::sm_overlayWindowY = 0;
 
 //-----------------------------------------------------------------------------
 // wxScreenDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC)
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxGTKScreenImplDC, wxGTKWindowImplDC)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxScreenDC,wxWindowDC)
+#endif
+
+#if wxUSE_NEW_DC
+wxGTKScreenImplDC::wxGTKScreenImplDC( wxScreenDC *owner ) 
+  : wxGTKWindowImplDC( owner )
+{ 
+    Init(); 
+}
+
+#else
+wxScreenDC::wxScreenDC() 
+{ 
+    Init(); 
+}
+#endif
 
-wxScreenDC::wxScreenDC()
+void wxGTKScreenImplDC::Init()
 {
-    m_ok = FALSE;
+    m_ok = false;
     m_cmap = gdk_colormap_get_system();
-    m_window = GDK_ROOT_PARENT();
+    m_window = 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();
 
@@ -56,32 +68,15 @@ wxScreenDC::wxScreenDC()
     gdk_gc_set_subwindow( m_bgGC, GDK_INCLUDE_INFERIORS );
 }
 
-wxScreenDC::~wxScreenDC()
+wxGTKScreenImplDC::~wxGTKScreenImplDC()
 {
     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 wxGTKScreenImplDC::DoGetSize(int *width, int *height) const
 {
     wxDisplaySize(width, height);
 }