clear up wxStringBuffer docs a bit

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

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index 85d37c6593d2d496f5eab3bc720cdb07f8f7f314..009cc6c746db021c0056b9fa81ed24c35e0cf60f 100644 (file)
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -13,7 +13,6 @@
 #define _WX_DC_H_
 
 #include "wx/defs.h"
-//#include "wx/dc.h"
 
 // ---------------------------------------------------------------------------
 // macros
@@ -67,6 +66,34 @@
 
 #define     wx_round(a)    (int)((a)+.5)
 
+#if wxUSE_DC_CACHEING
+/*
+ * Cached blitting, maintaining a cache
+ * of bitmaps required for transparent blitting
+ * instead of constant creation/deletion
+ */
+
+class wxDCCacheEntry : public wxObject
+{
+public:
+    wxDCCacheEntry( WXHBITMAP hBitmap
+                   ,int       nWidth
+                   ,int       nHeight
+                   ,int       nDepth
+                  );
+    wxDCCacheEntry( HPS   hPS
+                   ,int   nDepth
+                  );
+    ~wxDCCacheEntry();
+
+    WXHBITMAP                       m_hBitmap;
+    HPS                             m_hPS;
+    int                             m_nWidth;
+    int                             m_nHeight;
+    int                             m_nDepth;
+}; // end of CLASS wxDCCacheEntry
+#endif
+
 class WXDLLEXPORT wxDC : public wxDCBase
 {
     DECLARE_DYNAMIC_CLASS(wxDC)
@@ -151,7 +178,6 @@ public:
     HPS             GetHPS(void) const { return m_hPS; }
     void            SetHPS(HPS hPS)
     {
-        HDC                         hDC = ::GpiQueryDevice(hPS);
         m_hPS = hPS;
     }
     const wxBitmap& GetSelectedBitmap(void) const { return m_vSelectedBitmap; }
@@ -159,8 +185,22 @@ public:
 
     void            UpdateClipBox();
 
+#if wxUSE_DC_CACHEING
+    static wxDCCacheEntry* FindBitmapInCache( HPS hPS
+                                             ,int nWidth
+                                             ,int nHeight
+                                            );
+    static wxDCCacheEntry* FindDCInCache( wxDCCacheEntry* pNotThis
+                                         ,HPS             hPS
+                                        );
+
+    static void AddToBitmapCache(wxDCCacheEntry* pEntry);
+    static void AddToDCCache(wxDCCacheEntry* pEntry);
+    static void ClearCache(void);
+#endif
+
 protected:
-    virtual void DoFloodFill( wxCoord         vX
+    virtual bool DoFloodFill( wxCoord         vX
                              ,wxCoord         vY
                              ,const wxColour& rCol
                              ,int             nStyle = wxFLOOD_SURFACE
@@ -250,6 +290,8 @@ protected:
                         ,wxCoord vYsrc
                         ,int     nRop = wxCOPY
                         ,bool    bUseMask = FALSE
+                        ,wxCoord vXsrcMask = -1
+                        ,wxCoord vYsrcMask = -1
                        );
 
     virtual void DoSetClippingRegionAsRegion(const wxRegion& rRegion);
@@ -289,6 +331,10 @@ protected:
                                ,int     nFillStyle = wxODDEVEN_RULE
                               );
 
+#if wxUSE_PALETTE
+    void DoSelectPalette(bool bRealize = FALSE);
+    void InitializePalette(void);
+#endif // wxUSE_PALETTE
 
     //
     // common part of DoDrawText() and DoDrawRotatedText()
@@ -335,6 +381,11 @@ public:
     WXHBRUSH                        m_hOldBrush;
     WXHFONT                         m_hOldFont;
     WXHPALETTE                      m_hOldPalette;
-};
+
+#if wxUSE_DC_CACHEING
+    static wxList                   m_svBitmapCache;
+    static wxList                   m_svDCCache;
+#endif
+}; // end of CLASS wxDC
 #endif
     // _WX_DC_H_