previous commit removed WXDLLIMPEXP_HTML by mistake

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

diff --git a/include/wx/x11/dcscreen.h b/include/wx/x11/dcscreen.h
index 27cf673db2729d4260f6d6b60cf16a998f8424ac..67fd3d6df26adb80d3e62a6521ac7888674946fb 100644 (file)
--- a/include/wx/x11/dcscreen.h
+++ b/include/wx/x11/dcscreen.h
@@ -12,37 +12,40 @@
 #ifndef _WX_DCSCREEN_H_
 #define _WX_DCSCREEN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dcscreen.h"
 #endif
 
 #include "wx/dcclient.h"
 
-class WXDLLEXPORT wxScreenDC: public wxWindowDC
+//-----------------------------------------------------------------------------
+// wxScreenDC
+//-----------------------------------------------------------------------------
+
+class wxScreenDC : public wxPaintDC
 {
-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
-        
 public:
-    // Create a DC representing the whole screen
     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();
-    
+
+    // implementation
+
+    static WXWindow   *sm_overlayWindow;
+    static int         sm_overlayWindowX;
+    static int         sm_overlayWindowY;
+
+protected:
+    virtual void DoGetSize(int *width, int *height) const;
+
 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_