Application of the most recent wxWebView patch, the only changes were so tab to space...

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

diff --git a/include/wx/os2/dcscreen.h b/include/wx/os2/dcscreen.h
index 40daeab671cc5fca8c87e715d67ed5c431af171d..9b15277a43b2654bb21cfbe196f4c3c1c889a088 100644 (file)
--- a/include/wx/os2/dcscreen.h
+++ b/include/wx/os2/dcscreen.h
@@ -1,48 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcscreen.h
+// Name:        wx/os2/dcscreen.h

 // Purpose:     wxScreenDC class
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxScreenDC class
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_DCSCREEN_H_
-#define _WX_DCSCREEN_H_
+#ifndef _WX_OS2_DCSCREEN_H_
+#define _WX_OS2_DCSCREEN_H_

 
 

-#ifdef __GNUG__
-#pragma interface "dcscreen.h"
-#endif
-
-#include "wx/dcclient.h"
+#include "wx/dcscreen.h"
+#include "wx/os2/dc.h"

 
 

-class WXDLLEXPORT wxScreenDC: public wxWindowDC
+class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxPMDCImpl

 {
  public:
 {
  public:

-    //

     // Create a DC representing the whole screen
     // Create a DC representing the whole screen

-    //
-    wxScreenDC();
+    wxScreenDCImpl( wxScreenDC *owner );

 
 

-    //
-    // Compatibility with X's requirements for
-    // drawing on top of all windows
-    //
-    static bool StartDrawingOnTop(wxWindow* WXUNUSED(pWindow)) { return TRUE; }
-    static bool StartDrawingOnTop(wxRect* WXUNUSED(prect) = NULL) { return TRUE; }
-    static bool EndDrawingOnTop() { return TRUE; }
-
-protected:

     virtual void DoGetSize( int* pnWidth
                            ,int* pnHeight
                           ) const;
 
 private:
     virtual void DoGetSize( int* pnWidth
                            ,int* pnHeight
                           ) const;
 
 private:

-  DECLARE_DYNAMIC_CLASS(wxScreenDC)
+    DECLARE_CLASS(wxScreenDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);

 }; // end of CLASS wxScreenDC
 
 #endif
     // _WX_DCSCREEN_H_
 }; // end of CLASS wxScreenDC
 
 #endif
     // _WX_DCSCREEN_H_

-