1. fixed wxVector<T> iterators to actually point to what they're supposed to point...

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

diff --git a/include/wx/mac/metafile.h b/include/wx/mac/metafile.h
index e4be296d929fe941e6063147387f4ee1870d4300..fe7274d9fbdcb649605b994d3002cdb7deeef123 100644 (file)
--- a/include/wx/mac/metafile.h
+++ b/include/wx/mac/metafile.h
@@ -1,101 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        metafile.h
-// Purpose:     wxMetaFile, wxMetaFileDC classes.
-//              This probably should be restricted to Windows platforms,
-//              but if there is an equivalent on your platform, great.
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef _WX_METAFIILE_H_
-#define _WX_METAFIILE_H_
-
-#ifdef __GNUG__
-#pragma interface "metafile.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/metafile.h"
+#else
+#include "wx/mac/carbon/metafile.h"

 #endif
 #endif

-
-#include "wx/setup.h"
-
-/*
- * Metafile and metafile device context classes - work in Windows 3.1 only
- *
- */
-
-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxMetaFile: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxMetaFile)
- public:
-  wxMetaFile(const wxString& file = "");
-  ~wxMetaFile();
-
-  // After this is called, the metafile cannot be used for anything
-  // since it is now owned by the clipboard.
-  virtual bool SetClipboard(int width = 0, int height = 0);
-
-  virtual bool Play(wxDC *dc);
-  // TODO
-  inline bool Ok() { return FALSE; };
-
-/* TODO: Implementation
-  inline WXHANDLE GetHMETAFILE() { return m_metaFile; }
-  inline void SetHMETAFILE(WXHANDLE mf) { m_metaFile = mf; }
-
-protected:
-  WXHANDLE m_metaFile;
-*/
-};
-
-class WXDLLEXPORT wxMetaFileDC: public wxDC
-{
-  DECLARE_DYNAMIC_CLASS(wxMetaFileDC)
-
- public:
-  // Don't supply origin and extent
-  // Supply them to wxMakeMetaFilePlaceable instead.
-  wxMetaFileDC(const wxString& file = "");
-
-  // Supply origin and extent (recommended).
-  // Then don't need to supply them to wxMakeMetaFilePlaceable.
-  wxMetaFileDC(const wxString& file, int xext, int yext, int xorg, int yorg);
-
-  ~wxMetaFileDC();
-
-  // Should be called at end of drawing
-  virtual wxMetaFile *Close();
-  virtual void SetMapMode(int mode);
-  virtual void GetTextExtent(const wxString& string, float *x, float *y,
-                     float *descent = NULL, float *externalLeading = NULL,
-                     wxFont *theFont = NULL, bool use16bit = FALSE);
-
-  // Implementation
-  inline wxMetaFile *GetMetaFile() { return m_metaFile; }
-  inline void SetMetaFile(wxMetaFile *mf) { m_metaFile = mf; }
-  inline int GetWindowsMappingMode() { return m_windowsMappingMode; }
-  inline void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }
-
-protected:
-  int m_windowsMappingMode;
-  wxMetaFile *m_metaFile;
-};
-
-/*
- * Pass filename of existing non-placeable metafile, and bounding box.
- * Adds a placeable metafile header, sets the mapping mode to anisotropic,
- * and sets the window origin and extent to mimic the wxMM_TEXT mapping mode.
- *
- */
-
-// No origin or 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);
-
-#endif
-    // _WX_METAFIILE_H_