Use the correct WXDLLEXPORT declaration.

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

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index d54d3f44889618930a7dfb68afc8cba9dbea2e9a..e1ad714f22392c1f92b669f3f5fd71114b351af1 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,12 +66,40 @@
 
 #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
+                  );
+    ~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:
 class WXDLLEXPORT wxDC : public wxDCBase
 {
     DECLARE_DYNAMIC_CLASS(wxDC)
 
 public:

-    wxDC();
+    wxDC(void);

     ~wxDC();
 
     // implement base class pure virtuals
     ~wxDC();
 
     // implement base class pure virtuals


@@ -148,11 +175,32 @@ public:
         m_bOwnsDC = bOwnsDC;
     }
 
         m_bOwnsDC = bOwnsDC;
     }
 

+    HPS             GetHPS(void) const { return m_hPS; }
+    void            SetHPS(HPS hPS)
+    {
+        m_hPS = hPS;
+    }

     const wxBitmap& GetSelectedBitmap(void) const { return m_vSelectedBitmap; }
     wxBitmap&       GetSelectedBitmap(void) { return m_vSelectedBitmap; }
 
     const wxBitmap& GetSelectedBitmap(void) const { return m_vSelectedBitmap; }
     wxBitmap&       GetSelectedBitmap(void) { return m_vSelectedBitmap; }
 

+    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


@@ -242,6 +290,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);


@@ -250,17 +300,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


@@ -281,9 +320,10 @@ protected:
                                ,int     nFillStyle = wxODDEVEN_RULE
                               );
 
                                ,int     nFillStyle = wxODDEVEN_RULE
                               );
 

-#if wxUSE_SPLINES
-    virtual void DoDrawSpline(wxList* pPoints);
-#endif // wxUSE_SPLINES
+#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()


@@ -303,17 +343,22 @@ protected:
     wxWindow*                       m_pCanvas;
     wxBitmap                        m_vSelectedBitmap;
 
     wxWindow*                       m_pCanvas;
     wxBitmap                        m_vSelectedBitmap;
 

+public:
+    // PM specific stuff
+    HPS                             m_hPS;
+    HPS                             m_hOldPS;   // old hPS, if any
+    bool                            m_bIsPaintTime;// True at Paint Time
+
+    RECTL                           m_vRclPaint; // Bounding rectangle at Paint time etc.

     //
     // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
     //
     bool                            m_bOwnsDC:1;
 
     //
     //
     // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
     //
     bool                            m_bOwnsDC:1;
 
     //

-    // our HDC and its usage count: we only free it when the usage count drops
-    // to 0
+    // our HDC

     //
     WXHDC                           m_hDC;
     //
     WXHDC                           m_hDC;

-    int                             m_nDCCount;

 
     //
     // Store all old GDI objects when do a SelectObject, so we can select them
 
     //
     // Store all old GDI objects when do a SelectObject, so we can select them


@@ -325,6 +370,11 @@ protected:
     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_