implemented GetLabel() (part of patch 1679337)

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

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 49927b84b390a71d04f631111c920af2d25ffc25..0ab2cc622ec5e4611b3673f670cbc608a2d6db69 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -30,7 +30,7 @@ class wxDCCacheEntry: public wxObject
 public:
     wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth);
     wxDCCacheEntry(WXHDC hDC, int depth);
 public:
     wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth);
     wxDCCacheEntry(WXHDC hDC, int depth);

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

 
     WXHBITMAP   m_bitmap;
     WXHDC       m_dc;
 
     WXHBITMAP   m_bitmap;
     WXHDC       m_dc;


@@ -46,7 +46,7 @@ class WXDLLEXPORT wxDC : public wxDCBase
 {
 public:
     wxDC(WXHDC hDC) { Init(); m_hDC = hDC; }
 {
 public:
     wxDC(WXHDC hDC) { Init(); m_hDC = hDC; }

-    ~wxDC();
+    virtual ~wxDC();

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


@@ -133,6 +133,14 @@ public:
     static void ClearCache();
 #endif
 
     static void ClearCache();
 #endif
 

+    // RTL related functions
+    // ---------------------
+
+    // get or change the layout direction (LTR or RTL) for this dc,
+    // wxLayout_Default is returned if layout direction is not supported
+    virtual wxLayoutDirection GetLayoutDirection() const;
+    virtual void SetLayoutDirection(wxLayoutDirection dir);
+

 protected:
     void Init()
     {
 protected:
     void Init()
     {


@@ -224,6 +232,8 @@ 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); }

 
 
 #if wxUSE_PALETTE
 
 
 #if wxUSE_PALETTE


@@ -297,7 +307,11 @@ protected:
 class WXDLLEXPORT wxDCTemp : public wxDC
 {
 public:
 class WXDLLEXPORT wxDCTemp : public wxDC
 {
 public:

-    wxDCTemp(WXHDC hdc) : wxDC(hdc)
+    // 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),
+          m_size(size)

     {
     }
 
     {
     }
 


@@ -310,15 +324,20 @@ public:
 protected:
     virtual void DoGetSize(int *w, int *h) const
     {
 protected:
     virtual void DoGetSize(int *w, int *h) const
     {

-        wxFAIL_MSG( _T("no way to retrieve the size of generic DC") );
+        wxASSERT_MSG( m_size.IsFullySpecified(),
+                      _T("size of this DC hadn't been set and is unknown") );

 
         if ( w )
 
         if ( w )

-            *w = 0;
+            *w = m_size.x;

         if ( h )
         if ( h )

-            *h = 0;
+            *h = m_size.y;

     }
 
 private:
     }
 
 private:

+    // size of this DC must be explicitly set by SetSize() as we have no way to
+    // find it ourselves
+    const wxSize m_size;
+

     DECLARE_NO_COPY_CLASS(wxDCTemp)
 };
 
     DECLARE_NO_COPY_CLASS(wxDCTemp)
 };