refactor WM_COMMAND messages handling in MDI frames to avoid duplicating code unneces...

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

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index d5dc00aa1c276047ab00ef8ef2761e89612ced15..f0a70ddb4e6fdbacf19efe05d782c0461a53c9f5 100644 (file)
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -149,7 +149,7 @@ public:
     virtual void    SetAxisOrientation( bool bXLeftRight
                                        ,bool bYBottomUp
                                       );
-    virtual void    SetLogicalFunction(int nFunction);
+    virtual void    SetLogicalFunction(wxRasterOperationMode nFunction);
 
     // implementation from now on
     // --------------------------
@@ -196,23 +196,23 @@ public:
 protected:
     void Init()
     {
-       m_pCanvas      = NULL;
-       m_hOldBitmap   = 0;
-       m_hOldPen      = 0;
-       m_hOldBrush    = 0;
-       m_hOldFont     = 0;
+        m_pCanvas      = NULL;
+        m_hOldBitmap   = 0;
+        m_hOldPen      = 0;
+        m_hOldBrush    = 0;
+        m_hOldFont     = 0;
 #if wxUSE_PALETTE
         m_hOldPalette  = 0;
 #endif // wxUSE_PALETTE
 
-       m_bOwnsDC      = false;
-       m_hDC          = 0;
-       m_hOldPS       = NULL;
-       m_hPS          = NULL;
-       m_bIsPaintTime = false; // True at Paint Time
+        m_bOwnsDC      = false;
+        m_hDC          = 0;
+        m_hOldPS       = NULL;
+        m_hPS          = NULL;
+        m_bIsPaintTime = false; // True at Paint Time
 
-       m_pen.SetColour(*wxBLACK);
-       m_brush.SetColour(*wxWHITE);
+        m_pen.SetColour(*wxBLACK);
+        m_brush.SetColour(*wxWHITE);
     }
 
     // create an uninitialized DC: this should be only used by the derived
@@ -227,10 +227,10 @@ public:
                                     ,wxCoord*        pExternalLeading = NULL
                                     ,const wxFont*   pTheFont = NULL
                                    ) const;
-    virtual bool DoFloodFill( wxCoord         vX
-                             ,wxCoord         vY
-                             ,const wxColour& rCol
-                             ,int             nStyle = wxFLOOD_SURFACE
+    virtual bool DoFloodFill( wxCoord          vX
+                             ,wxCoord          vY
+                             ,const wxColour&  rCol
+                             ,wxFloodFillStyle nStyle = wxFLOOD_SURFACE
                             );
 
     virtual bool DoGetPixel( wxCoord   vX
@@ -315,18 +315,18 @@ public:
                         ,wxDC*   pSource
                         ,wxCoord vXsrc
                         ,wxCoord vYsrc
-                        ,int     nRop = wxCOPY
+                        ,wxRasterOperationMode     nRop = wxCOPY
                         ,bool    bUseMask = FALSE
                         ,wxCoord vXsrcMask = -1
                         ,wxCoord vYsrcMask = -1
                        );
 
-    virtual void DoSetClippingRegionAsRegion(const wxRegion& rRegion);
     virtual void DoSetClippingRegion( wxCoord vX
                                      ,wxCoord vY
                                      ,wxCoord vWidth
                                      ,wxCoord vHeight
                                     );
+    virtual void DoSetDeviceClippingRegion(const wxRegion& rRegion);
 
     virtual void DoGetSize( int* pWidth
                            ,int* pHeight
@@ -344,7 +344,7 @@ public:
                                ,wxPoint vaPoints[]
                                ,wxCoord vXoffset
                                ,wxCoord vYoffset
-                               ,int     nFillStyle = wxODDEVEN_RULE
+                               ,wxPolygonFillMode     nFillStyle = wxODDEVEN_RULE
                               );
 
 #if wxUSE_PALETTE