use the native wxImageList under Win32 as otherwise xUniv doesn't link currently

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

diff --git a/include/wx/motif/metafile.h b/include/wx/motif/metafile.h
index b6f823b860a98f38a556ce2ae8108c3e623030df..058d34d2ad3fc15ef32558b569f5cb6e02d4b59d 100644 (file)
--- a/include/wx/motif/metafile.h
+++ b/include/wx/motif/metafile.h
@@ -11,7 +11,6 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
@@ -22,74 +21,67 @@
 #include "wx/setup.h"
 
 /*
- * Metafile and metafile device context classes - work in Windows 3.1 only
- *
- */
+* 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;
-*/
+    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; };
+    
 };
 
 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; }
-
+    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;
+    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.
- *
- */
+* 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);
@@ -98,4 +90,4 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, float scale =
 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_
+// _WX_METAFIILE_H_