X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/palmos/metafile.h diff --git a/include/wx/palmos/metafile.h b/include/wx/palmos/metafile.h index ccbb807c26..483398e284 100644 --- a/include/wx/palmos/metafile.h +++ b/include/wx/palmos/metafile.h @@ -25,22 +25,25 @@ class WXDLLIMPEXP_FWD_CORE wxMetafile; -class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData { - friend class WXDLLIMPEXP_FWD_CORE wxMetafile; public: wxMetafileRefData(); virtual ~wxMetafileRefData(); + virtual bool IsOk() const { return m_metafile != 0; } + public: WXHANDLE m_metafile; int m_windowsMappingMode; int m_width, m_height; + + friend class WXDLLIMPEXP_FWD_CORE wxMetafile; }; #define M_METAFILEDATA ((wxMetafileRefData *)m_refData) -class WXDLLEXPORT wxMetafile: public wxGDIObject +class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject { public: wxMetafile(const wxString& file = wxEmptyString); @@ -51,8 +54,6 @@ public: virtual bool SetClipboard(int width = 0, int height = 0); virtual bool Play(wxDC *dc); - bool Ok() const { return IsOk(); } - bool IsOk() 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()); } @@ -72,7 +73,7 @@ private: DECLARE_DYNAMIC_CLASS(wxMetafile) }; -class WXDLLEXPORT wxMetafileDC: public wxDC +class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC { public: // Don't supply origin and extent @@ -87,7 +88,7 @@ public: // Should be called at end of drawing virtual wxMetafile *Close(); - virtual void SetMapMode(int mode); + virtual void SetMapMode(wxMappingMode mode); virtual void GetTextExtent(const wxString& string, long *x, long *y, long *descent = NULL, long *externalLeading = NULL, const wxFont *theFont = NULL, bool use16bit = FALSE) const; @@ -114,10 +115,10 @@ private: */ // No origin or extent -bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); +bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0); // Optional origin and extent -bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE); +bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE); // ---------------------------------------------------------------------------- // wxMetafileDataObject is a specialization of wxDataObject for metafile data @@ -125,7 +126,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y #if wxUSE_DRAG_AND_DROP -class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple +class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple { public: // ctors