don't misinterpret the time after the date as a weekday (patch 1836708)

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 90e878d4b186041aeb8dce407cdda82ac51870de..66901ddb6ef5d52c47d3d75935e767e4d7bb098a 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -40,6 +40,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 class WXDLLIMPEXP_FWD_CORE wxScreenDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
+class WXDLLIMPEXP_FWD_CORE wxPrintData;
 
 //-----------------------------------------------------------------------------
 // wxDrawObject helper class
@@ -184,6 +185,18 @@ public:
     // query dimension, colour deps, resolution
 
     virtual void DoGetSize(int *width, int *height) const = 0;
+    void GetSize(int *width, int *height) const
+    {
+        return DoGetSize(width, height);
+    }
+
+    wxSize GetSize() const
+    {
+        int w, h;
+        DoGetSize(&w, &h);
+        return wxSize(w, h);
+    }
+
     virtual void DoGetSizeMM(int* width, int* height) const = 0;
 
     virtual int GetDepth() const = 0;
@@ -569,13 +582,8 @@ public:
 
     void GetSize(int *width, int *height) const
         { m_pimpl->DoGetSize(width, height); }
-
     wxSize GetSize() const
-    {
-        int w, h;
-        m_pimpl->DoGetSize(&w, &h);
-        return wxSize(w, h);
-    }
+        { return m_pimpl->GetSize(); }
 
     void GetSizeMM(int* width, int* height) const
         { m_pimpl->DoGetSizeMM(width, height); }