* Implemented BestSize cache

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

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index f28ffedd8d82f52c44258e1f7bf375220651fc24..8ed710e9e685466621623a6ac2ce704000093b0d 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "dc.h"
 #endif
 
     #pragma interface "dc.h"
 #endif
 


@@ -80,6 +80,7 @@ public:
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
                                  wxFont *theFont = NULL) const;
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
                                  wxFont *theFont = NULL) const;

+    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;

 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;
 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;


@@ -117,6 +118,13 @@ public:
     {
         m_hDC = dc;
         m_bOwnsDC = bOwnsDC;
     {
         m_hDC = dc;
         m_bOwnsDC = bOwnsDC;

+
+        // we might have a pre existing clipping region, make sure that we
+        // return it if asked -- but avoid calling ::GetClipBox() right now as
+        // it could be unnecessary wasteful
+        m_clipping = true;
+        m_clipX1 =
+        m_clipX2 = 0;

     }
 
     const wxBitmap& GetSelectedBitmap() const { return m_selectedBitmap; }
     }
 
     const wxBitmap& GetSelectedBitmap() const { return m_selectedBitmap; }


@@ -135,7 +143,7 @@ public:
 #endif
 
 protected:
 #endif
 
 protected:

-    virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,

                              int style = wxFLOOD_SURFACE);
 
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
                              int style = wxFLOOD_SURFACE);
 
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;


@@ -181,6 +189,8 @@ protected:
     {
         GetClippingBox(x, y, width, height);
     }
     {
         GetClippingBox(x, y, width, height);
     }

+    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
+                                  wxCoord *w, wxCoord *h) const;

 
     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;


@@ -190,6 +200,9 @@ protected:
     virtual void DoDrawPolygon(int n, wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                int fillStyle = wxODDEVEN_RULE);
     virtual void DoDrawPolygon(int n, wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
                                int fillStyle = wxODDEVEN_RULE);

+    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+                                   wxCoord xoffset, wxCoord yoffset,
+                                   int fillStyle = wxODDEVEN_RULE);

 
 
 #if wxUSE_PALETTE
 
 
 #if wxUSE_PALETTE


@@ -241,10 +254,11 @@ protected:
 #endif
 
     DECLARE_DYNAMIC_CLASS(wxDC)
 #endif
 
     DECLARE_DYNAMIC_CLASS(wxDC)

+    DECLARE_NO_COPY_CLASS(wxDC)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// wxDCTemp: a wxDC which doesn't free the given HDC (used by wxWindows
+// wxDCTemp: a wxDC which doesn't free the given HDC (used by wxWidgets

 // only/mainly)
 // ----------------------------------------------------------------------------
 
 // only/mainly)
 // ----------------------------------------------------------------------------
 


@@ -253,6 +267,9 @@ class WXDLLEXPORT wxDCTemp : public wxDC
 public:
     wxDCTemp(WXHDC hdc) { SetHDC(hdc); }
     virtual ~wxDCTemp() { SetHDC((WXHDC)NULL); }
 public:
     wxDCTemp(WXHDC hdc) { SetHDC(hdc); }
     virtual ~wxDCTemp() { SetHDC((WXHDC)NULL); }

+
+private:
+    DECLARE_NO_COPY_CLASS(wxDCTemp)

 };
 
 #endif
 };
 
 #endif