wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...

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

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index f6381d489e2f798a15215fde91ff195a8ae8378b..97ade188385f480382f7a4c34830c6e1c0f95645 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -12,7 +12,7 @@
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "metafile.h"
 #endif
 
     #pragma interface "metafile.h"
 #endif
 


@@ -27,13 +27,6 @@
     #include "wx/dataobj.h"
 #endif
 
     #include "wx/dataobj.h"
 #endif
 

-// provide synonyms for all metafile classes
-#define wxMetaFile wxMetafile
-#define wxMetaFileDC wxMetafileDC
-#define wxMetaFileDataObject wxMetafileDataObject
-
-#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
-

 // ----------------------------------------------------------------------------
 // Metafile and metafile device context classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Metafile and metafile device context classes
 // ----------------------------------------------------------------------------


@@ -70,6 +63,7 @@ public:
     bool Ok() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
 
     // set/get the size of metafile for clipboard operations
     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()); }

     int GetWidth() const { return M_METAFILEDATA->m_width; }
     int GetHeight() const { return M_METAFILEDATA->m_height; }
 
     int GetWidth() const { return M_METAFILEDATA->m_width; }
     int GetHeight() const { return M_METAFILEDATA->m_height; }
 


@@ -99,7 +93,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
 public:
     // Don't supply origin and extent
     // Supply them to wxMakeMetaFilePlaceable instead.
 public:
     // Don't supply origin and extent
     // Supply them to wxMakeMetaFilePlaceable instead.

-    wxMetafileDC(const wxString& file = "");
+    wxMetafileDC(const wxString& file = wxEmptyString);

 
     // Supply origin and extent (recommended).
     // Then don't need to supply them to wxMakeMetaFilePlaceable.
 
     // Supply origin and extent (recommended).
     // Then don't need to supply them to wxMakeMetaFilePlaceable.


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


@@ -139,7 +133,7 @@ private:
 bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
 
 // Optional origin and extent
 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
 
 // ----------------------------------------------------------------------------
 // wxMetafileDataObject is a specialization of wxDataObject for metafile data