Applied fix for VC++ 7 which treats __LINE__ slightly differently, apparently.

[wxWidgets.git] / include / wx / x11 / dcscreen.h

diff --git a/include/wx/x11/dcscreen.h b/include/wx/x11/dcscreen.h
index 27cf673db2729d4260f6d6b60cf16a998f8424ac..c1f9751d4a1da6ef501be21b08038dace3c2e45f 100644 (file)
--- a/include/wx/x11/dcscreen.h
+++ b/include/wx/x11/dcscreen.h
@@ -18,31 +18,34 @@
 
 #include "wx/dcclient.h"
 
 
 #include "wx/dcclient.h"
 

-class WXDLLEXPORT wxScreenDC: public wxWindowDC
+//-----------------------------------------------------------------------------
+// wxScreenDC
+//-----------------------------------------------------------------------------
+
+class wxScreenDC : public wxPaintDC

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
-        

 public:
 public:

-    // Create a DC representing the whole screen

     wxScreenDC();
     wxScreenDC();

-    ~wxScreenDC();
-    
-    // Compatibility with X's requirements for
-    // drawing on top of all windows
-    static bool StartDrawingOnTop(wxWindow* window);
-    static bool StartDrawingOnTop(wxRect* rect = NULL);
+    virtual ~wxScreenDC();
+
+    static bool StartDrawingOnTop( wxWindow *window );
+    static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );

     static bool EndDrawingOnTop();
     static bool EndDrawingOnTop();

-    
+
+    // implementation
+
+    static WXWindow   *sm_overlayWindow;
+    static int         sm_overlayWindowX;
+    static int         sm_overlayWindowY;
+
+protected:
+    virtual void DoGetSize(int *width, int *height) const;
+

 private:
 private:

-    static WXWindow sm_overlayWindow;
-    
-    // If we have started transparent drawing at a non-(0,0) point
-    // then we will have to adjust the device origin in the
-    // constructor.
-    static int sm_overlayWindowX;
-    static int sm_overlayWindowY;
+    DECLARE_DYNAMIC_CLASS(wxScreenDC)

 };
 
 };
 

+

 #endif
 // _WX_DCSCREEN_H_
 
 #endif
 // _WX_DCSCREEN_H_