Better fix

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

diff --git a/include/wx/palmos/metafile.h b/include/wx/palmos/metafile.h
index 21f70fc0ae0022b09d81338ad47512aac897b686..3a0c60eb8af91917e9666ea00fc8b07714ae16aa 100644 (file)
--- a/include/wx/palmos/metafile.h
+++ b/include/wx/palmos/metafile.h
@@ -12,14 +12,6 @@
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "metafile.h"
-#endif
-
-#include "wx/setup.h"
-
-#if wxUSE_METAFILE
-

 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 
 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 


@@ -31,19 +23,22 @@
 // Metafile and metafile device context classes
 // ----------------------------------------------------------------------------
 
 // Metafile and metafile device context classes
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMetafile;
+class WXDLLIMPEXP_FWD_CORE wxMetafile;

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

-    friend class WXDLLEXPORT wxMetafile;

 public:
     wxMetafileRefData();
 public:
     wxMetafileRefData();

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

 
 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;
     int m_width, m_height;
 
 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;
     int m_width, m_height;

+
+    friend class WXDLLIMPEXP_FWD_CORE wxMetafile;

 };
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 };
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)


@@ -52,7 +47,6 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
 {
 public:
     wxMetafile(const wxString& file = wxEmptyString);
 {
 public:
     wxMetafile(const wxString& file = wxEmptyString);

-    wxMetafile(const wxMetafile& metafile) { Ref(metafile); }

     virtual ~wxMetafile();
 
     // After this is called, the metafile cannot be used for anything
     virtual ~wxMetafile();
 
     // After this is called, the metafile cannot be used for anything


@@ -60,7 +54,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);

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

 
     // set/get the size of metafile for clipboard operations
     wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
 
     // set/get the size of metafile for clipboard operations
     wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }


@@ -76,14 +69,6 @@ public:
     int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; }
     void SetWindowsMappingMode(int mm);
 
     int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; }
     void SetWindowsMappingMode(int mm);
 

-    // Operators
-    wxMetafile& operator=(const wxMetafile& metafile)
-        { if (*this != metafile) Ref(metafile); return *this; }
-    bool operator==(const wxMetafile& metafile) const
-        { return m_refData == metafile.m_refData; }
-    bool operator!=(const wxMetafile& metafile) const
-        { return m_refData != metafile.m_refData; }
-

 private:
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };


@@ -106,7 +91,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
     wxMetafile *GetMetaFile() const { return m_metaFile; }
 
     // Implementation
     wxMetafile *GetMetaFile() const { return m_metaFile; }


@@ -168,7 +153,6 @@ protected:
 
 #endif // wxUSE_DRAG_AND_DROP
 
 
 #endif // wxUSE_DRAG_AND_DROP
 

-#endif // wxUSE_METAFILE

 #endif
     // _WX_METAFIILE_H_
 
 #endif
     // _WX_METAFIILE_H_