don't compare invalid iterators/node pointers

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

diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index a79f479bbf60a8602e4bfc1a27b0251c8f565d1e..dbd3a29229b6469beec629de5fb0fd229cc7cc36 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/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"


@@ -58,47 +57,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