removed extra semicolon

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

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index d15134c520afafc136ec1d4125e8859af781113a..55cf236972eeb66682f38e541bd3e766c7be9630 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -3,86 +3,116 @@
 // Purpose:     wxMetaFile, wxMetaFileDC classes.
 //              This probably should be restricted to Windows platforms,
 //              but if there is an equivalent on your platform, great.
 // Purpose:     wxMetaFile, wxMetaFileDC classes.
 //              This probably should be restricted to Windows platforms,
 //              but if there is an equivalent on your platform, great.

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/10/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 

-#ifdef __GNUG__
-#pragma interface "metafile.h"
-#endif
-
-#include "wx/setup.h"

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

+#include "wx/gdiobj.h"
+
+#if wxUSE_DRAG_AND_DROP
+#include "wx/dataobj.h"
+#endif

 
 /*
 
 /*

- * Metafile and metafile device context classes - work in Windows 3.1 only
+ * Metafile and metafile device context classes

  *
  */
 
  *
  */
 

-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxMetaFile: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxMetaFile)
- public:
-  wxMetaFile(const wxString& file = "");
-  ~wxMetaFile();
+#define wxMetaFile wxMetafile
+#define wxMetaFileDC wxMetafileDC

 
 

-  // 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);
+class WXDLLIMPEXP_FWD_CORE wxMetafile;

 
 

-  virtual bool Play(wxDC *dc);
-  // TODO
-  inline bool Ok() { return FALSE; };
+class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
+{
+    friend class WXDLLIMPEXP_FWD_CORE wxMetafile;
+public:
+    wxMetafileRefData(void);
+    virtual ~wxMetafileRefData(void);
+
+public:
+    WXHANDLE m_metafile;
+    int m_windowsMappingMode;
+};

 
 

-/* TODO: Implementation
-  inline WXHANDLE GetHMETAFILE() { return m_metaFile; }
-  inline void SetHMETAFILE(WXHANDLE mf) { m_metaFile = mf; }
+#define M_METAFILEDATA ((wxMetafileRefData *)m_refData)

 
 

-protected:
-  WXHANDLE m_metaFile;
-*/
+class WXDLLEXPORT wxMetafile: public wxGDIObject
+{
+    DECLARE_DYNAMIC_CLASS(wxMetafile)
+public:
+    wxMetafile(const wxString& file = wxEmptyString);
+    virtual ~wxMetafile(void);
+
+    // 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);
+    inline bool Ok() const { return IsOk(); }
+    inline bool IsOk(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
+
+    // Implementation
+    inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; }
+    void SetHMETAFILE(WXHANDLE mf) ;
+    inline int GetWindowsMappingMode(void) { return M_METAFILEDATA->m_windowsMappingMode; }
+    void SetWindowsMappingMode(int mm);

 };
 
 };
 

-class WXDLLEXPORT wxMetaFileDC: public wxDC
+class WXDLLEXPORT wxMetafileDC: public wxDC

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMetaFileDC)
+    DECLARE_DYNAMIC_CLASS(wxMetafileDC)

 
 

- public:
-  // Don't supply origin and extent
-  // Supply them to wxMakeMetaFilePlaceable instead.
-  wxMetaFileDC(const wxString& file = "");
+public:
+    // Don't supply origin and extent
+    // Supply them to wxMakeMetaFilePlaceable instead.
+    wxMetafileDC(const wxString& file = wxEmptyString);

 
 

-  // 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);
+    // 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();
+    virtual ~wxMetafileDC(void);

 
 

-  // 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);
+    // Should be called at end of drawing
+    virtual wxMetafile *Close(void);
+    virtual void SetMapMode(int 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;

 
 

-  // 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; }
+    // Implementation
+    inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
+    inline void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
+    inline int GetWindowsMappingMode(void) const { return m_windowsMappingMode; }
+    inline void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }

 
 protected:
 
 protected:

-  int m_windowsMappingMode;
-  wxMetaFile *m_metaFile;
+    int           m_windowsMappingMode;
+    wxMetafile*   m_metaFile;
+
+private:
+#ifndef __WATCOMC__
+    // function hiding warning supression
+    // still required ??
+    inline virtual void   GetTextExtent( const wxString& string
+                                        ,long*           width
+                                        ,long*           height
+                                        ,long*           descent = NULL
+                                        ,long*           externalLeading = NULL
+                                        ,wxFont*         theFont = NULL
+                                       ) const
+    { GetTextExtent( string, width, height, descent, externalLeading, theFont, false);};
+#endif

 };
 
 /*
 };
 
 /*


@@ -93,10 +123,63 @@ protected:
  */
 
 // No origin or extent
  */
 
 // No origin or extent

-bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, float scale = 1.0);
+#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
+bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);

 
 // Optional origin and extent
 
 // 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
+// ----------------------------------------------------------------------------
+
+// TODO: implement OLE side of things. At present, it's just for clipboard
+// use.
+
+#if wxUSE_DRAG_AND_DROP
+class WXDLLEXPORT wxMetafileDataObject : public wxDataObject
+{
+public:
+    // ctors
+    wxMetafileDataObject() { m_width = 0; m_height = 0; };
+    wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0)
+                        :m_metafile(metafile)
+                        ,m_width(width)
+                        ,m_height(height) { }
+
+    void SetMetafile(const wxMetafile& metafile, int w = 0, int h = 0)
+        { m_metafile = metafile; m_width = w; m_height = h; }
+    wxMetafile GetMetafile() const { return m_metafile; }
+    int GetWidth() const { return m_width; }
+    int GetHeight() const { return m_height; }
+
+    virtual wxDataFormat GetFormat() const { return wxDF_METAFILE; }
+
+/* ??
+    // implement base class pure virtuals
+    virtual wxDataFormat GetPreferredFormat() const
+        { return (wxDataFormat) wxDataObject::Text; }
+    virtual bool IsSupportedFormat(wxDataFormat format) const
+        { return format == wxDataObject::Text || format == wxDataObject::Locale; }
+    virtual size_t GetDataSize() const
+        { return m_strText.Len() + 1; } // +1 for trailing '\0'of course
+    virtual void GetDataHere(void *pBuf) const
+        { memcpy(pBuf, m_strText.c_str(), GetDataSize()); }
+*/
+
+private:
+    wxMetafile   m_metafile;
+    int          m_width;
+    int          m_height;
+};
+#endif

 
 #endif
     // _WX_METAFIILE_H_
 
 #endif
     // _WX_METAFIILE_H_