clear m_aTypes array in Clear() as well (patch 1165866)

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

diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h
index aa9d55875f45dfc806c5e5a3217421e2e43b7fa2..1777302433dede520102c10ff726250c257c00d9 100644 (file)
--- a/include/wx/mgl/dc.h
+++ b/include/wx/mgl/dc.h
@@ -16,7 +16,6 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/dc.h"

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


@@ -29,6 +28,7 @@ class WXDLLEXPORT wxDC;
 // constants
 //-----------------------------------------------------------------------------
 
 // constants
 //-----------------------------------------------------------------------------
 

+#ifndef MM_TEXT

 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2
 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2


@@ -37,6 +37,7 @@ class WXDLLEXPORT wxDC;
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7

+#endif

 
 //-----------------------------------------------------------------------------
 // wxDC
 
 //-----------------------------------------------------------------------------
 // wxDC


@@ -99,7 +100,7 @@ public:
 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------

-    
+

     virtual void ComputeScaleAndOrigin();
 
     wxCoord XDEV2LOG(wxCoord x) const
     virtual void ComputeScaleAndOrigin();
 
     wxCoord XDEV2LOG(wxCoord x) const


@@ -164,7 +165,7 @@ public:
     }
 
     MGLDevCtx *GetMGLDC() const { return m_MGLDC; }
     }
 
     MGLDevCtx *GetMGLDC() const { return m_MGLDC; }

-    void SetMGLDC(MGLDevCtx *mgldc, bool OwnsMGLDC = FALSE);
+    void SetMGLDC(MGLDevCtx *mgldc, bool OwnsMGLDC = false);

 
 protected:
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
 
 protected:
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,


@@ -191,7 +192,7 @@ protected:
 
     virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
 
     virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,

-                              bool useMask = FALSE);
+                              bool useMask = false);

 
     virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
 
     virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,


@@ -199,18 +200,13 @@ protected:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                        int rop = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);

 
     // this is gnarly - we can't even call this function DoSetClippingRegion()
     // because of virtual function hiding
     virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
                                      wxCoord width, wxCoord height);
 
     // this is gnarly - we can't even call this function DoSetClippingRegion()
     // because of virtual function hiding
     virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
                                      wxCoord width, wxCoord height);

-    virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
-                                     wxCoord *width, wxCoord *height)
-    {
-        GetClippingBox(x, y, width, height);
-    }

 
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;


@@ -230,50 +226,50 @@ protected:
 
     // common part of DoDrawText() and DoDrawRotatedText()
     void DrawAnyText(const wxString& text, wxCoord x, wxCoord y);
 
     // common part of DoDrawText() and DoDrawRotatedText()
     void DrawAnyText(const wxString& text, wxCoord x, wxCoord y);

-    
+

     // MGL uses pens as both wxPens and wxBrushes, so we have to
     // switch them as needed:
     void SelectPen();
     void SelectBrush();
     void SelectMGLStipplePen(int style);
     void SelectMGLFatPen(int style, int flag);
     // MGL uses pens as both wxPens and wxBrushes, so we have to
     // switch them as needed:
     void SelectPen();
     void SelectBrush();
     void SelectMGLStipplePen(int style);
     void SelectMGLFatPen(int style, int flag);

-    
+

     // Select m_font into m_MGLDC:
     bool SelectMGLFont();
     // Select m_font into m_MGLDC:
     bool SelectMGLFont();

-    
+

     // Convert wxWin logical function to MGL rop:
     int LogicalFunctionToMGLRop(int logFunc) const;
     // Convert wxWin logical function to MGL rop:
     int LogicalFunctionToMGLRop(int logFunc) const;

-    
+

     // Unified implementation of DrawIcon, DrawBitmap and Blit:
     // Unified implementation of DrawIcon, DrawBitmap and Blit:

-    void DoDrawSubBitmap(const wxBitmap &bmp, 
+    void DoDrawSubBitmap(const wxBitmap &bmp,

                          wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                          wxCoord destx, wxCoord desty, int rop, bool useMask);
 
     // MGL DC class we use:
     MGLDevCtx        *m_MGLDC;
     bool              m_OwnsMGLDC:1;
                          wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                          wxCoord destx, wxCoord desty, int rop, bool useMask);
 
     // MGL DC class we use:
     MGLDevCtx        *m_MGLDC;
     bool              m_OwnsMGLDC:1;

-   
+

     // helper variables for SelectXXXX():
     bool              m_penSelected;
     bool              m_brushSelected;
     bool              m_downloadedPatterns[2];
 
     // helper variables for SelectXXXX():
     bool              m_penSelected;
     bool              m_brushSelected;
     bool              m_downloadedPatterns[2];
 

-    // MGL does not render lines with width>1 with endings centered 
+    // MGL does not render lines with width>1 with endings centered

     // at given coords but with top left corner of the pen at them,
     // these offsets are used to correct it. They are computed by
     // SelectPen.
     int               m_penOfsX, m_penOfsY;
 
     double            m_mm_to_pix_x, m_mm_to_pix_y;
     // at given coords but with top left corner of the pen at them,
     // these offsets are used to correct it. They are computed by
     // SelectPen.
     int               m_penOfsX, m_penOfsY;
 
     double            m_mm_to_pix_x, m_mm_to_pix_y;

-    
+

     wxPalette         m_oldPalette;
     wxPalette         m_oldPalette;

-    
+

     wxRegion          m_currentClippingRegion;
     wxRegion          m_globalClippingRegion;
 
     // wxDC::Blit handles memoryDCs as special cases :(
     bool              m_isMemDC;
     wxRegion          m_currentClippingRegion;
     wxRegion          m_globalClippingRegion;
 
     // wxDC::Blit handles memoryDCs as special cases :(
     bool              m_isMemDC;

-    
+

     font_t            *m_mglFont;
 };
 
     font_t            *m_mglFont;
 };