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

[wxWidgets.git] / include / wx / os2 / metafile.h

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 66f2899ddf22863ac28845a8ad268a8ab874a588..6a79199a78eadbeb85c7e4e99eb1f6b79bd4e56a 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -30,15 +30,17 @@
 #define wxMetaFile wxMetafile
 #define wxMetaFileDC wxMetafileDC
 
 #define wxMetaFile wxMetafile
 #define wxMetaFileDC wxMetafileDC
 

-class WXDLLEXPORT wxMetafile;
+class WXDLLIMPEXP_FWD_CORE wxMetafile;

 
 class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
 {

-    friend class WXDLLEXPORT wxMetafile;
+    friend class WXDLLIMPEXP_FWD_CORE wxMetafile;

 public:
     wxMetafileRefData(void);
     virtual ~wxMetafileRefData(void);
 
 public:
     wxMetafileRefData(void);
     virtual ~wxMetafileRefData(void);
 

+    virtual bool IsOk() const { return m_metafile != 0; }
+

 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;
 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;


@@ -58,8 +60,6 @@ public:
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);

-    inline bool Ok() const { return IsOk(); }
-    inline bool IsOk(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };

 
     // Implementation
     inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; }
 
     // Implementation
     inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; }


@@ -88,7 +88,7 @@ public:
     virtual void SetMapMode(int mode);
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
                                long *descent = NULL, long *externalLeading = NULL,
     virtual void SetMapMode(int mode);
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
                                long *descent = NULL, long *externalLeading = NULL,

-                               wxFont *theFont = NULL, bool use16bit = false) const;
+                               const wxFont *theFont = NULL, bool use16bit = false) const;

 
     // Implementation
     inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
 
     // Implementation
     inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }