X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ff64980aaae854d35260b57449dd46fb2f70954..ee4c13659b6a54d8f71e3ec9a3051f156fad9deb:/include/wx/msw/gdiimage.h?ds=sidebyside diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h index ac89747bd5..8c6cd818cb 100644 --- a/include/wx/msw/gdiimage.h +++ b/include/wx/msw/gdiimage.h @@ -16,10 +16,6 @@ #ifndef _WX_MSW_GDIIMAGE_H_ #define _WX_MSW_GDIIMAGE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "gdiimage.h" -#endif - #include "wx/gdiobj.h" // base class #include "wx/gdicmn.h" // wxBITMAP_TYPE_INVALID #include "wx/list.h" @@ -44,7 +40,7 @@ public: m_handle = 0; } - wxGDIImageRefData(const wxGDIImageRefData& data) + wxGDIImageRefData(const wxGDIImageRefData& data) : wxGDIRefData(data) { m_width = data.m_width; m_height = data.m_height; @@ -102,8 +98,8 @@ public: void SetExtension(const wxString& ext) { m_extension = ext; } void SetType(long type) { m_type = type; } - wxString GetName() const { return m_name; } - wxString GetExtension() const { return m_extension; } + const wxString& GetName() const { return m_name; } + const wxString& GetExtension() const { return m_extension; } long GetType() const { return m_type; } // real handler operations: to implement in derived classes @@ -176,7 +172,7 @@ public: void SetSize(const wxSize& size) { SetSize(size.x, size.y); } // forward some of base class virtuals to wxGDIImageRefData - bool FreeResource(bool force = FALSE); + bool FreeResource(bool force = false); virtual WXHANDLE GetResourceHandle() const; protected: