Fix assert when destroying wxDataViewCtrl being edited in wxGTK.

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

diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h
index 89377fd23c7c44c3257e10ecd85a8cc7f22e37b0..dfe7c050a5c4aba0c31e21e58f449ef116345fd4 100644 (file)
--- a/include/wx/os2/dc.h
+++ b/include/wx/os2/dc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.h
+// Name:        wx/os2/dc.h

 // Purpose:     wxDC class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxDC class
 // Author:      David Webster
 // Modified by:


@@ -13,7 +13,7 @@
 #define _WX_DC_H_
 
 #include "wx/defs.h"
 #define _WX_DC_H_
 
 #include "wx/defs.h"

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

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


@@ -85,7 +85,7 @@ public:
     wxDCCacheEntry( HPS   hPS
                    ,int   nDepth
                   );
     wxDCCacheEntry( HPS   hPS
                    ,int   nDepth
                   );

-    ~wxDCCacheEntry();
+    virtual ~wxDCCacheEntry();

 
     WXHBITMAP                       m_hBitmap;
     HPS                             m_hPS;
 
     WXHBITMAP                       m_hBitmap;
     HPS                             m_hPS;


@@ -95,24 +95,26 @@ public:
 }; // end of CLASS wxDCCacheEntry
 #endif
 
 }; // end of CLASS wxDCCacheEntry
 #endif
 

-class WXDLLEXPORT wxDC : public wxDCBase
+// this is an ABC: use one of the derived classes to create a DC associated
+// with a window, screen, printer and so on
+class WXDLLIMPEXP_CORE wxPMDCImpl : public wxDCImpl

 {
     DECLARE_DYNAMIC_CLASS(wxDC)
 
 public:
 {
     DECLARE_DYNAMIC_CLASS(wxDC)
 
 public:

-    wxDC(void);
-    ~wxDC();
+    wxPMDCImpl(wxDC *owner, WXHDC hDC);
+    virtual ~wxPMDCImpl();

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

-    virtual void Clear(void);
+    virtual void Clear();

 
     virtual bool    StartDoc(const wxString& rsMessage);
 
     virtual bool    StartDoc(const wxString& rsMessage);

-    virtual void    EndDoc(void);
+    virtual void    EndDoc();

 
 

-    virtual void    StartPage(void);
-    virtual void    EndPage(void);
+    virtual void    StartPage();
+    virtual void    EndPage();

 
     virtual void    SetFont(const wxFont& rFont);
     virtual void    SetPen(const wxPen& rPen);
 
     virtual void    SetFont(const wxFont& rFont);
     virtual void    SetPen(const wxPen& rPen);


@@ -121,29 +123,20 @@ public:
     virtual void    SetBackgroundMode(int nMode);
     virtual void    SetPalette(const wxPalette& rPalette);
 
     virtual void    SetBackgroundMode(int nMode);
     virtual void    SetPalette(const wxPalette& rPalette);
 

-    virtual void    DestroyClippingRegion(void);
+    virtual void    DestroyClippingRegion();

 
 

-    virtual wxCoord GetCharHeight(void) const;
-    virtual wxCoord GetCharWidth(void) const;
-    virtual void    DoGetTextExtent( const wxString& rsString
-                                    ,wxCoord*        pX
-                                    ,wxCoord*        pY
-                                    ,wxCoord*        pDescent = NULL
-                                    ,wxCoord*        pExternalLeading = NULL
-                                    ,wxFont*         pTheFont = NULL
-                                   ) const;
-    virtual bool    CanDrawBitmap(void) const;
-    virtual bool    CanGetTextExtent(void) const;
-    virtual int     GetDepth(void) const;
-    virtual wxSize  GetPPI(void) const;
+    virtual wxCoord GetCharHeight() const;
+    virtual wxCoord GetCharWidth() const;

 
 

-    virtual void    SetMapMode(int nMode);
+    virtual bool    CanDrawBitmap() const;
+    virtual bool    CanGetTextExtent() const;
+    virtual int     GetDepth() const;
+    virtual wxSize  GetPPI() const;
+
+    virtual void    SetMapMode(wxMappingMode nMode);

     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
                                    );


@@ -156,7 +149,7 @@ public:
     virtual void    SetAxisOrientation( bool bXLeftRight
                                        ,bool bYBottomUp
                                       );
     virtual void    SetAxisOrientation( bool bXLeftRight
                                        ,bool bYBottomUp
                                       );

-    virtual void    SetLogicalFunction(int nFunction);
+    virtual void    SetLogicalFunction(wxRasterOperationMode nFunction);

 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -164,10 +157,10 @@ public:
     virtual void    SetRop(WXHDC hCdc);
     virtual void    SelectOldObjects(WXHDC hDc);
 
     virtual void    SetRop(WXHDC hCdc);
     virtual void    SelectOldObjects(WXHDC hDc);
 

-    wxWindow*       GetWindow(void) const { return m_pCanvas; }
+    wxWindow*       GetWindow() const { return m_pCanvas; }

     void            SetWindow(wxWindow* pWin) { m_pCanvas = pWin; }
 
     void            SetWindow(wxWindow* pWin) { m_pCanvas = pWin; }
 

-    WXHDC           GetHDC(void) const { return m_hDC; }
+    WXHDC           GetHDC() const { return m_hDC; }

     void            SetHDC( WXHDC hDc
                            ,bool  bOwnsDC = FALSE
                           )
     void            SetHDC( WXHDC hDc
                            ,bool  bOwnsDC = FALSE
                           )


@@ -176,14 +169,13 @@ public:
         m_bOwnsDC = bOwnsDC;
     }
 
         m_bOwnsDC = bOwnsDC;
     }
 

-    HPS             GetHPS(void) const { return m_hPS; }
+    HPS             GetHPS() const { return m_hPS; }

     void            SetHPS(HPS hPS)
     {
     void            SetHPS(HPS hPS)
     {

-        HDC                         hDC = ::GpiQueryDevice(hPS);

         m_hPS = hPS;
     }
         m_hPS = hPS;
     }

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

 
     void            UpdateClipBox();
 
 
     void            UpdateClipBox();
 


@@ -198,14 +190,47 @@ public:
 
     static void AddToBitmapCache(wxDCCacheEntry* pEntry);
     static void AddToDCCache(wxDCCacheEntry* pEntry);
 
     static void AddToBitmapCache(wxDCCacheEntry* pEntry);
     static void AddToDCCache(wxDCCacheEntry* pEntry);

-    static void ClearCache(void);
+    static void ClearCache();

 #endif
 
 protected:
 #endif
 
 protected:

-    virtual void DoFloodFill( wxCoord         vX
-                             ,wxCoord         vY
-                             ,const wxColour& rCol
-                             ,int             nStyle = wxFLOOD_SURFACE
+    void Init()
+    {
+        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_pen.SetColour(*wxBLACK);
+        m_brush.SetColour(*wxWHITE);
+    }
+
+    // create an uninitialized DC: this should be only used by the derived
+    // classes
+    wxPMDCImpl( wxDC *owner ) : wxDCImpl( owner ) { Init(); }
+
+public:
+    virtual void    DoGetTextExtent( const wxString& rsString
+                                    ,wxCoord*        pX
+                                    ,wxCoord*        pY
+                                    ,wxCoord*        pDescent = NULL
+                                    ,wxCoord*        pExternalLeading = NULL
+                                    ,const wxFont*   pTheFont = NULL
+                                   ) const;
+    virtual bool DoFloodFill( wxCoord          vX
+                             ,wxCoord          vY
+                             ,const wxColour&  rCol
+                             ,wxFloodFillStyle nStyle = wxFLOOD_SURFACE

                             );
 
     virtual bool DoGetPixel( wxCoord   vX
                             );
 
     virtual bool DoGetPixel( wxCoord   vX


@@ -290,29 +315,18 @@ protected:
                         ,wxDC*   pSource
                         ,wxCoord vXsrc
                         ,wxCoord vYsrc
                         ,wxDC*   pSource
                         ,wxCoord vXsrc
                         ,wxCoord vYsrc

-                        ,int     nRop = wxCOPY
+                        ,wxRasterOperationMode     nRop = wxCOPY

                         ,bool    bUseMask = FALSE
                         ,wxCoord vXsrcMask = -1
                         ,wxCoord vYsrcMask = -1
                        );
 
                         ,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 DoSetClippingRegion( wxCoord vX
                                      ,wxCoord vY
                                      ,wxCoord vWidth
                                      ,wxCoord vHeight
                                     );

-    virtual void DoGetClippingRegion( wxCoord* pX
-                                     ,wxCoord* pY
-                                     ,wxCoord* pWidth
-                                     ,wxCoord* pHeight)
-    {
-        GetClippingBox( pX
-                       ,pY
-                       ,pWidth
-                       ,pHeight
-                      );
-    }
+    virtual void DoSetDeviceClippingRegion(const wxRegion& rRegion);

 
     virtual void DoGetSize( int* pWidth
                            ,int* pHeight
 
     virtual void DoGetSize( int* pWidth
                            ,int* pHeight


@@ -330,10 +344,15 @@ protected:
                                ,wxPoint vaPoints[]
                                ,wxCoord vXoffset
                                ,wxCoord vYoffset
                                ,wxPoint vaPoints[]
                                ,wxCoord vXoffset
                                ,wxCoord vYoffset

-                               ,int     nFillStyle = wxODDEVEN_RULE
+                               ,wxPolygonFillMode     nFillStyle = wxODDEVEN_RULE

                               );
 
                               );
 

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

 
 

+protected:

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