X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/msw/gdiimage.h?ds=sidebyside

diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h
index 6ab0fa5a77..a2016597c2 100644
--- a/include/wx/msw/gdiimage.h
+++ b/include/wx/msw/gdiimage.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/msw/gdiimage.h
+// Name:        wx/msw/gdiimage.h
 // Purpose:     wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
 //              under MSW
 // Author:      Vadim Zeitlin
@@ -40,7 +40,7 @@ public:
         m_handle = 0;
     }
 
-    wxGDIImageRefData(const wxGDIImageRefData& data) : wxGDIRefData(data)
+    wxGDIImageRefData(const wxGDIImageRefData& data) : wxGDIRefData()
     {
         m_width = data.m_width;
         m_height = data.m_height;
@@ -113,6 +113,12 @@ public:
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; }
     int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_depth; }
 
+    wxSize GetSize() const
+    {
+        return IsNull() ? wxSize(0,0) :
+               wxSize(GetGDIImageData()->m_width, GetGDIImageData()->m_height);
+    }
+
     void SetWidth(int w) { AllocExclusive(); GetGDIImageData()->m_width = w; }
     void SetHeight(int h) { AllocExclusive(); GetGDIImageData()->m_height = h; }
     void SetDepth(int d) { AllocExclusive(); GetGDIImageData()->m_depth = d; }
@@ -139,7 +145,7 @@ protected:
     virtual wxGDIRefData *
     CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
     {
-        wxFAIL_MSG( _T("must be implemented if used") );
+        wxFAIL_MSG( wxT("must be implemented if used") );
 
         return NULL;
     }