removed wxDCWindowImpl::m_win; use wxDCImpl::m_window instead (fixes caret-related...

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

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 9e6f7fcab813261351df1b4965333718ef6a58b0..b031941f5e7eefe592f50b7ed80f1c5ff84e62c8 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -13,6 +13,7 @@
 #define _WX_MSW_DC_H_
 
 #include "wx/defs.h"
 #define _WX_MSW_DC_H_
 
 #include "wx/defs.h"

+#include "wx/dc.h"

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


@@ -42,11 +43,11 @@ public:
 
 // this is an ABC: use one of the derived classes to create a DC associated
 // with a window, screen, printer and so on
 
 // this is an ABC: use one of the derived classes to create a DC associated
 // with a window, screen, printer and so on

-class WXDLLEXPORT wxDC : public wxDCBase
+class WXDLLIMPEXP_CORE wxMSWDCImpl: public wxDCImpl

 {
 public:
 {
 public:

-    wxDC(WXHDC hDC) { Init(); m_hDC = hDC; }
-    virtual ~wxDC();
+    wxMSWDCImpl(wxDC *owner, WXHDC hDC);
+    virtual ~wxMSWDCImpl();

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


@@ -78,13 +79,14 @@ public:
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 

+

     virtual void SetMapMode(int mode);
     virtual void SetUserScale(double x, double y);
     virtual void SetMapMode(int mode);
     virtual void SetUserScale(double x, double y);

-    virtual void SetSystemScale(double x, double y);

     virtual void SetLogicalScale(double x, double y);
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
     virtual void SetLogicalScale(double x, double y);
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);

+

     virtual void SetLogicalFunction(int function);
 
     // implementation from now on
     virtual void SetLogicalFunction(int function);
 
     // implementation from now on


@@ -93,10 +95,9 @@ public:
     virtual void SetRop(WXHDC cdc);
     virtual void SelectOldObjects(WXHDC dc);
 
     virtual void SetRop(WXHDC cdc);
     virtual void SelectOldObjects(WXHDC dc);
 

-    wxWindow *GetWindow() const { return m_canvas; }

     void SetWindow(wxWindow *win)
     {
     void SetWindow(wxWindow *win)
     {

-        m_canvas = win;
+        m_window = win;

 
 #if wxUSE_PALETTE
         // if we have palettes use the correct one for this window
 
 #if wxUSE_PALETTE
         // if we have palettes use the correct one for this window


@@ -144,7 +145,6 @@ public:
 protected:
     void Init()
     {
 protected:
     void Init()
     {

-        m_canvas = NULL;

         m_bOwnsDC = false;
         m_hDC = NULL;
 
         m_bOwnsDC = false;
         m_hDC = NULL;
 


@@ -160,13 +160,16 @@ protected:
 
     // create an uninitialized DC: this should be only used by the derived
     // classes
 
     // create an uninitialized DC: this should be only used by the derived
     // classes

-    wxDC() { Init(); }
+    wxMSWDCImpl( wxDC *owner ) : wxDCImpl( owner ) { Init(); }

 
 

+    void RealizeScaleAndOrigin();
+
+public:

     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,

-                                 wxFont *theFont = NULL) const;
+                                 const wxFont *theFont = NULL) const;

     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,


@@ -197,7 +200,7 @@ protected:
     virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 
 #if wxUSE_SPLINES
     virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 
 #if wxUSE_SPLINES

-    virtual void DoDrawSpline(wxList *points);
+    virtual void DoDrawSpline(const wxPointList *points);

 #endif
 
     virtual void DoCrossHair(wxCoord x, wxCoord y);
 #endif
 
     virtual void DoCrossHair(wxCoord x, wxCoord y);


@@ -240,8 +243,11 @@ protected:
     virtual void DoDrawPolyPolygon(int n, int count[], 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);

-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
-    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
+    {
+        return subrect == NULL ? GetSelectedBitmap()
+                               : GetSelectedBitmap().GetSubBitmap(*subrect);
+    }

 
 
 #if wxUSE_PALETTE
 
 
 #if wxUSE_PALETTE


@@ -255,6 +261,7 @@ protected:
     void InitializePalette();
 #endif // wxUSE_PALETTE
 
     void InitializePalette();
 #endif // wxUSE_PALETTE
 

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


@@ -299,12 +306,12 @@ protected:
 #endif // wxUSE_PALETTE
 
 #if wxUSE_DC_CACHEING
 #endif // wxUSE_PALETTE
 
 #if wxUSE_DC_CACHEING

-    static wxList     sm_bitmapCache;
-    static wxList     sm_dcCache;
+    static wxObjectList     sm_bitmapCache;
+    static wxObjectList     sm_dcCache;

 #endif
 
 #endif
 

-    DECLARE_DYNAMIC_CLASS(wxDC)
-    DECLARE_NO_COPY_CLASS(wxDC)
+    DECLARE_CLASS(wxMSWDCImpl)
+    DECLARE_NO_COPY_CLASS(wxMSWDCImpl)

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


@@ -312,24 +319,23 @@ protected:
 // only/mainly)
 // ----------------------------------------------------------------------------
 
 // only/mainly)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDCTemp : public wxDC
+class WXDLLIMPEXP_CORE wxDCTempImpl : public wxMSWDCImpl

 {
 public:
     // construct a temporary DC with the specified HDC and size (it should be
     // specified whenever we know it for this HDC)
 {
 public:
     // construct a temporary DC with the specified HDC and size (it should be
     // specified whenever we know it for this HDC)

-    wxDCTemp(WXHDC hdc, const wxSize& size = wxDefaultSize)
-        : wxDC(hdc),
+    wxDCTempImpl(wxDC *owner, WXHDC hdc, const wxSize& size )
+        : wxMSWDCImpl( owner, hdc ),

           m_size(size)
     {
     }
 
           m_size(size)
     {
     }
 

-    virtual ~wxDCTemp()
+    virtual ~wxDCTempImpl()

     {
         // prevent base class dtor from freeing it
         SetHDC((WXHDC)NULL);
     }
 
     {
         // prevent base class dtor from freeing it
         SetHDC((WXHDC)NULL);
     }
 

-protected:

     virtual void DoGetSize(int *w, int *h) const
     {
         wxASSERT_MSG( m_size.IsFullySpecified(),
     virtual void DoGetSize(int *w, int *h) const
     {
         wxASSERT_MSG( m_size.IsFullySpecified(),


@@ -346,7 +352,16 @@ private:
     // find it ourselves
     const wxSize m_size;
 
     // find it ourselves
     const wxSize m_size;
 

-    DECLARE_NO_COPY_CLASS(wxDCTemp)
+    DECLARE_NO_COPY_CLASS(wxDCTempImpl)
+};
+
+class WXDLLIMPEXP_CORE wxDCTemp : public wxDC
+{
+public:
+    wxDCTemp(WXHDC hdc, const wxSize& size = wxDefaultSize)
+        : wxDC(new wxDCTempImpl(this, hdc, size))
+    {
+    }

 };
 
 #endif // _WX_MSW_DC_H_
 };
 
 #endif // _WX_MSW_DC_H_