Removed gsockosx.cpp which had been copied to src/mac/corefoundation long ago.

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

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index b404333e13c64e59edbb08ce3af65bae4b27576f..fb9149e1add73d7a8a296e4e3186d5b4a7e370a7 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -41,6 +41,12 @@ 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();
     m_isScreenDC = TRUE;
 
     SetUpDC();


@@ -61,47 +67,19 @@ 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
 }
 
 void wxScreenDC::DoGetSize(int *width, int *height) const