Fix off by 1 error in wxHTML font size from points calculation.

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

diff --git a/include/wx/os2/dcscreen.h b/include/wx/os2/dcscreen.h
index e0b4204008cf799e25607f5d94701f2043b7bc1c..9b15277a43b2654bb21cfbe196f4c3c1c889a088 100644 (file)
--- a/include/wx/os2/dcscreen.h
+++ b/include/wx/os2/dcscreen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.h
+// Name:        wx/os2/dcscreen.h
 // Purpose:     wxScreenDC class
 // Author:      David Webster
 // Modified by:
@@ -9,30 +9,26 @@
 // 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:
-  // Create a DC representing the whole screen
-  wxScreenDC();
+    // Create a DC representing the whole screen
+    wxScreenDCImpl( wxScreenDC *owner );
+
+    virtual void DoGetSize( int* pnWidth
+                           ,int* pnHeight
+                          ) const;
 
-  // Compatibility with X's requirements for
-  // drawing on top of all windows
-  static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return TRUE; }
-  static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return TRUE; }
-  static bool EndDrawingOnTop() { return TRUE; }
 private:
-  DECLARE_DYNAMIC_CLASS(wxScreenDC)
+    DECLARE_CLASS(wxScreenDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 }; // end of CLASS wxScreenDC
 
 #endif
     // _WX_DCSCREEN_H_
-