build fixes

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

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index 85d37c6593d2d496f5eab3bc720cdb07f8f7f314..e3f48e3710530794e67b13a665ac00554d2d9709 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"
 #define _WX_DC_H_
 
 #include "wx/defs.h"

-//#include "wx/dc.h"

 
 // ---------------------------------------------------------------------------
 // macros
 
 // ---------------------------------------------------------------------------
 // macros


@@ -67,13 +66,41 @@
 
 #define     wx_round(a)    (int)((a)+.5)
 
 
 #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
+                  );
+    virtual ~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)
 
 public:
     wxDC(void);
 class WXDLLEXPORT wxDC : public wxDCBase
 {
     DECLARE_DYNAMIC_CLASS(wxDC)
 
 public:
     wxDC(void);

-    ~wxDC();
+    virtual ~wxDC();

 
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------


@@ -102,7 +129,7 @@ public:
                                     ,wxCoord*        pY
                                     ,wxCoord*        pDescent = NULL
                                     ,wxCoord*        pExternalLeading = NULL
                                     ,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;
                                    ) const;
     virtual bool    CanDrawBitmap(void) const;
     virtual bool    CanGetTextExtent(void) const;


@@ -113,9 +140,6 @@ public:
     virtual void    SetUserScale( double dX
                                  ,double dY
                                 );
     virtual void    SetUserScale( double dX
                                  ,double dY
                                 );

-    virtual void    SetSystemScale( double dX
-                                   ,double dY
-                                  );

     virtual void    SetLogicalScale( double dX
                                     ,double dY
                                    );
     virtual void    SetLogicalScale( double dX
                                     ,double dY
                                    );


@@ -151,7 +175,6 @@ public:
     HPS             GetHPS(void) const { return m_hPS; }
     void            SetHPS(HPS hPS)
     {
     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; }
         m_hPS = hPS;
     }
     const wxBitmap& GetSelectedBitmap(void) const { return m_vSelectedBitmap; }


@@ -159,8 +182,22 @@ public:
 
     void            UpdateClipBox();
 
 
     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:
 protected:

-    virtual void DoFloodFill( wxCoord         vX
+    virtual bool DoFloodFill( wxCoord         vX

                              ,wxCoord         vY
                              ,const wxColour& rCol
                              ,int             nStyle = wxFLOOD_SURFACE
                              ,wxCoord         vY
                              ,const wxColour& rCol
                              ,int             nStyle = wxFLOOD_SURFACE


@@ -250,6 +287,8 @@ protected:
                         ,wxCoord vYsrc
                         ,int     nRop = wxCOPY
                         ,bool    bUseMask = FALSE
                         ,wxCoord vYsrc
                         ,int     nRop = wxCOPY
                         ,bool    bUseMask = FALSE

+                        ,wxCoord vXsrcMask = -1
+                        ,wxCoord vYsrcMask = -1

                        );
 
     virtual void DoSetClippingRegionAsRegion(const wxRegion& rRegion);
                        );
 
     virtual void DoSetClippingRegionAsRegion(const wxRegion& rRegion);


@@ -258,17 +297,6 @@ protected:
                                      ,wxCoord vWidth
                                      ,wxCoord vHeight
                                     );
                                      ,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
 
     virtual void DoGetSize( int* pWidth
                            ,int* pHeight


@@ -289,6 +317,10 @@ protected:
                                ,int     nFillStyle = wxODDEVEN_RULE
                               );
 
                                ,int     nFillStyle = wxODDEVEN_RULE
                               );
 

+#if wxUSE_PALETTE
+    void DoSelectPalette(bool bRealize = FALSE);
+    void InitializePalette(void);
+#endif // wxUSE_PALETTE

 
     //
     // common part of DoDrawText() and DoDrawRotatedText()
 
     //
     // common part of DoDrawText() and DoDrawRotatedText()


@@ -335,6 +367,11 @@ public:
     WXHBRUSH                        m_hOldBrush;
     WXHFONT                         m_hOldFont;
     WXHPALETTE                      m_hOldPalette;
     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_
 #endif
     // _WX_DC_H_