fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 1cd67be835df13b6d53541357244429ef3511e50..ab3b1c9ccf3e3c8c4b20b1623a2dfd885a683fb6 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dc.h
 // Purpose:     wxDC class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dc.h
 // Purpose:     wxDC class

-// Author:      Vadim Zeitlin
+// Author:      Vadim Zeitlin 

 // Modified by:
 // Created:     05/25/99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     05/25/99
 // RCS-ID:      $Id$


@@ -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 wxScreenDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;

+class WXDLLIMPEXP_FWD_CORE wxPrintData;

 
 //-----------------------------------------------------------------------------
 // wxDrawObject helper class
 
 //-----------------------------------------------------------------------------
 // wxDrawObject helper class


@@ -129,7 +130,7 @@ public:
     virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data  ) = 0;
 #endif
 
     virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data  ) = 0;
 #endif
 

-    static void SetDCFactory( wxDCFactory *factory );
+    static void Set(wxDCFactory *factory);

     static wxDCFactory *Get();
 
 private:
     static wxDCFactory *Get();
 
 private:


@@ -184,6 +185,19 @@ public:
     // query dimension, colour deps, resolution
 
     virtual void DoGetSize(int *width, int *height) const = 0;
     // query dimension, colour deps, resolution
 
     virtual void DoGetSize(int *width, int *height) const = 0;

+    void GetSize(int *width, int *height) const
+    {
+        DoGetSize(width, height);
+        return ;
+    }
+
+    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;
     virtual void DoGetSizeMM(int* width, int* height) const = 0;
 
     virtual int GetDepth() const = 0;


@@ -552,7 +566,7 @@ public:
     const wxDCImpl *GetImpl() const
         { return m_pimpl; }
 
     const wxDCImpl *GetImpl() const
         { return m_pimpl; }
 

-    wxWindow *GetWindow()
+    wxWindow *GetWindow() const

         { return m_pimpl->GetWindow(); }
 
     bool IsOk() const
         { return m_pimpl->GetWindow(); }
 
     bool IsOk() const


@@ -569,13 +583,8 @@ public:
 
     void GetSize(int *width, int *height) const
         { m_pimpl->DoGetSize(width, height); }
 
     void GetSize(int *width, int *height) const
         { m_pimpl->DoGetSize(width, height); }

-

     wxSize GetSize() const
     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); }
 
     void GetSizeMM(int* width, int* height) const
         { m_pimpl->DoGetSizeMM(width, height); }