Corrected/added support for column headers with icon and text

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

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 87abc354211b85af511182e4e8214b43dbc01aa6..b031941f5e7eefe592f50b7ed80f1c5ff84e62c8 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -43,7 +43,7 @@ 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 wxMSWDCImpl: public wxDCImpl
+class WXDLLIMPEXP_CORE wxMSWDCImpl: public wxDCImpl

 {
 public:
     wxMSWDCImpl(wxDC *owner, WXHDC hDC);
 {
 public:
     wxMSWDCImpl(wxDC *owner, WXHDC hDC);


@@ -86,7 +86,7 @@ public:
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
     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


@@ -164,6 +164,7 @@ protected:
 
     void RealizeScaleAndOrigin();
 
 
     void RealizeScaleAndOrigin();
 

+public:

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


@@ -242,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


@@ -257,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);
 


@@ -314,7 +319,7 @@ protected:
 // only/mainly)
 // ----------------------------------------------------------------------------
 
 // only/mainly)
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     // construct a temporary DC with the specified HDC and size (it should be
 {
 public:
     // construct a temporary DC with the specified HDC and size (it should be


@@ -331,7 +336,6 @@ public:
         SetHDC((WXHDC)NULL);
     }
 
         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(),


@@ -351,17 +355,14 @@ private:
     DECLARE_NO_COPY_CLASS(wxDCTempImpl)
 };
 
     DECLARE_NO_COPY_CLASS(wxDCTempImpl)
 };
 

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

 {
 public:
 {
 public:

-    wxDCTemp( WXHDC hdc, const wxSize& size = wxDefaultSize )
+    wxDCTemp(WXHDC hdc, const wxSize& size = wxDefaultSize)
+        : wxDC(new wxDCTempImpl(this, hdc, size))

     {
     {

-        m_pimpl = new wxDCTempImpl( this, hdc, size );

     }
     }

-

 };
 
 };
 

-
-

 #endif // _WX_MSW_DC_H_
 
 #endif // _WX_MSW_DC_H_