fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/motif/dcscreen.h b/include/wx/motif/dcscreen.h
index ebd022e76bb27eeee0b681733268f9ed610376ce..fce03a0e2e383cd27f82b4281f9117a810eb7b8e 100644 (file)
--- a/include/wx/motif/dcscreen.h
+++ b/include/wx/motif/dcscreen.h
@@ -12,28 +12,33 @@
 #ifndef _WX_DCSCREEN_H_
 #define _WX_DCSCREEN_H_
 
-#ifdef __GNUG__
-#pragma interface "dcscreen.h"
-#endif
-
 #include "wx/dcclient.h"
 
-class WXDLLEXPORT wxScreenDC: public wxPaintDC
+class WXDLLEXPORT wxScreenDC: public wxWindowDC
 {
-  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* WXUNUSED(window)) { return TRUE; }
-  static bool StartDrawingOnTop(wxRectangle* WXUNUSED(rect) = NULL) { return TRUE; }
-  static bool EndDrawingOnTop() { return TRUE; }
+    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);
+    static bool EndDrawingOnTop();
+    
+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;
 };
 
 #endif
-    // _WX_DCSCREEN_H_
+// _WX_DCSCREEN_H_