removed #errors in 2.7 compilation

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

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index 825cd2b2deacd64b2fd236c779b49d9f8645d4b9..152c7c72cfc8f7f021a50f5f6b10d5cf968a8025 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -7,9 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -38,6 +37,14 @@ wxScreenDC::wxScreenDC()
     m_cmap = gdk_colormap_get_system();
     m_window = GDK_ROOT_PARENT();
 
     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();
 
     gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
     SetUpDC();
 
     gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );


@@ -56,46 +63,22 @@ wxScreenDC::~wxScreenDC()
     EndDrawingOnTop();
 }
 
     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()
 {
 }
 
 bool wxScreenDC::EndDrawingOnTop()
 {

-    return TRUE;
+    return true;

 }
 
 }
 

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