]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/os2/dc.h
replaced wxFDIODispatcher::RunLoop() with Dispatch() which handles only one event...
[wxWidgets.git] / include / wx / os2 / dc.h
index fd832ef9324798925c66d590b37bae40cdcf6c59..e3f48e3710530794e67b13a665ac00554d2d9709 100644 (file)
@@ -13,7 +13,6 @@
 #define _WX_DC_H_
 
 #include "wx/defs.h"
-//#include "wx/dc.h"
 
 // ---------------------------------------------------------------------------
 // macros
@@ -85,7 +84,7 @@ public:
     wxDCCacheEntry( HPS   hPS
                    ,int   nDepth
                   );
-    ~wxDCCacheEntry();
+    virtual ~wxDCCacheEntry();
 
     WXHBITMAP                       m_hBitmap;
     HPS                             m_hPS;
@@ -101,7 +100,7 @@ class WXDLLEXPORT wxDC : public wxDCBase
 
 public:
     wxDC(void);
-    ~wxDC();
+    virtual ~wxDC();
 
     // implement base class pure virtuals
     // ----------------------------------
@@ -130,7 +129,7 @@ public:
                                     ,wxCoord*        pY
                                     ,wxCoord*        pDescent = NULL
                                     ,wxCoord*        pExternalLeading = NULL
-                                    ,wxFont*         pTheFont = NULL
+                                    ,const wxFont*   pTheFont = NULL
                                    ) const;
     virtual bool    CanDrawBitmap(void) const;
     virtual bool    CanGetTextExtent(void) const;
@@ -141,9 +140,6 @@ public:
     virtual void    SetUserScale( double dX
                                  ,double dY
                                 );
-    virtual void    SetSystemScale( double dX
-                                   ,double dY
-                                  );
     virtual void    SetLogicalScale( double dX
                                     ,double dY
                                    );
@@ -301,17 +297,6 @@ protected:
                                      ,wxCoord vWidth
                                      ,wxCoord vHeight
                                     );
-    virtual void DoGetClippingRegion( wxCoord* pX
-                                     ,wxCoord* pY
-                                     ,wxCoord* pWidth
-                                     ,wxCoord* pHeight)
-    {
-        GetClippingBox( pX
-                       ,pY
-                       ,pWidth
-                       ,pHeight
-                      );
-    }
 
     virtual void DoGetSize( int* pWidth
                            ,int* pHeight