missing commit

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

diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index cd47777fdbd8d5caf8d90305ac178f87be7ee608..1cff4e457fa0d457b40bd8e113a1bf14da7e7408 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -1,121 +1,66 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.cpp
+// Name:        src/gtk1/dcscreen.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dcscreen.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"

 #endif
 
 #endif
 

+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+

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

-#include "wx/window.h"
-#include "gdk/gdkx.h"
+#include "wx/gtk1/dcscreen.h"

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

-// wxScreenDC
+// global data initialization

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

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

 
 

-wxScreenDC::wxScreenDC(void)
-{
-  m_ok = FALSE;
-  m_window = (GdkWindow *) NULL;
-  m_cmap = gdk_colormap_get_system();
-  
-  m_window = GDK_ROOT_PARENT();
-  
-  SetUpDC();
-  
-  gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
-  gdk_gc_set_subwindow( m_brushGC, GDK_INCLUDE_INFERIORS );
-  gdk_gc_set_subwindow( m_textGC, GDK_INCLUDE_INFERIORS );
-  gdk_gc_set_subwindow( m_bgGC, GDK_INCLUDE_INFERIORS );
-}
-
-wxScreenDC::~wxScreenDC(void)
-{
-  EndDrawingOnTop();
-}
+//-----------------------------------------------------------------------------
+// wxScreenDCImpl
+//-----------------------------------------------------------------------------

 
 

-bool wxScreenDC::StartDrawingOnTop( wxWindow *WXUNUSED(window) )
-{
-  return TRUE;
-/*
-  if (!window)
-  {
-    StartDrawingOnTop();
-    return;
-  }
-  wxRectangle rect;
-  rect.x = 0;
-  rect.y = 0;
-  window->GetPosition( &rect.x, &rect.y );
-  rect.width = 0;
-  rect.height = 0;
-  window->GetSize( &rect.width, &rect.height );
-  window->ClientToScreen( &rect.x, &rect.y );
-  StartDrawingOnTop( &rect );
-  return TRUE;
-*/
-}
+IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxPaintDCImpl)

 
 

-bool wxScreenDC::StartDrawingOnTop( wxRectangle *WXUNUSED(rect) )
+wxScreenDCImpl::wxScreenDCImpl(wxScreenDC *owner)
+              : wxPaintDCImpl(owner)

 {
 {

-  return TRUE;
-/*
-  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;
-  }
-  
-  GTK cannot set transparent backgrounds. :-(
+    m_ok = false;
+    m_cmap = gdk_colormap_get_system();
+    m_window = GDK_ROOT_PARENT();

 
 

-  GdkWindowAttr attr;
-  attr.x = x;
-  attr.y = y;
-  attr.width = width;
-  attr.height = height;
-  attr.override_redirect = TRUE;
-  attr.wclass = GDK_INPUT_OUTPUT;
-  attr.event_mask = 0;
-  attr.window_type = GDK_WINDOW_TEMP;
-  m_window = gdk_window_new( NULL, &attr, GDK_WA_NOREDIR | GDK_WA_X | GDK_WA_Y );
-  
-  gdk_window_show( m_window );
+    m_isScreenDC = true;

 
 

-  m_window = GDK_ROOT_PARENT();
-  
-  SetUpDC();
-  
-  gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
-  gdk_gc_set_subwindow( m_brushGC, GDK_INCLUDE_INFERIORS );
-  gdk_gc_set_subwindow( m_textGC, GDK_INCLUDE_INFERIORS );
-  gdk_gc_set_subwindow( m_bgGC, GDK_INCLUDE_INFERIORS );
+    SetUpDC();

 
 

-  return TRUE;
-*/
+    gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
+    gdk_gc_set_subwindow( m_brushGC, GDK_INCLUDE_INFERIORS );
+    gdk_gc_set_subwindow( m_textGC, GDK_INCLUDE_INFERIORS );
+    gdk_gc_set_subwindow( m_bgGC, GDK_INCLUDE_INFERIORS );

 }
 
 }
 

-bool wxScreenDC::EndDrawingOnTop(void)
+wxScreenDCImpl::~wxScreenDCImpl()

 {
 {

-  return TRUE;
-/*
-  if (m_window) gdk_window_destroy( m_window );
-  m_window = NULL;
-  m_isOk = FALSE;
-  return TRUE;
-*/
+    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 );

 }
 
 }
 

+void wxScreenDCImpl::DoGetSize(int *width, int *height) const
+{
+    wxDisplaySize(width, height);
+}