X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9317fd47263a9521466156d7bf0f7988000bf15..ce336c6d76d8c513487af08857c1cd3cbe806d30:/include/wx/msw/metafile.h?ds=inline diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h index c1a648fd24..97ade18838 100644 --- a/include/wx/msw/metafile.h +++ b/include/wx/msw/metafile.h @@ -12,7 +12,7 @@ #ifndef _WX_METAFIILE_H_ #define _WX_METAFIILE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "metafile.h" #endif @@ -106,7 +106,7 @@ public: 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; + wxFont *theFont = NULL, bool use16bit = false) const; // Implementation wxMetafile *GetMetaFile() const { return m_metaFile; } @@ -133,7 +133,7 @@ private: bool WXDLLEXPORT 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 WXDLLEXPORT 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