Sorry folks, a lot of changes to remedy GetFont, GetBrush etc.

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

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index c4c0665ed7eed960c1a65d6b4ff06690a5fade51..f8ad981949d1fb840f596f6b771bc627085ab6d5 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -5,13 +5,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifndef __METAFIILEH__
-#define __METAFIILEH__
+#ifndef _WX_METAFIILE_H_
+#define _WX_METAFIILE_H_
 
 #ifdef __GNUG__
 #pragma interface "metafile.h"
@@ -19,7 +19,7 @@
 
 #include "wx/setup.h"
 
-#if USE_METAFILE
+#if wxUSE_METAFILE
 #include "wx/dc.h"
 
 /*
@@ -71,9 +71,9 @@ class WXDLLEXPORT wxMetaFileDC: public wxDC
   // Should be called at end of drawing
   virtual wxMetaFile *Close(void);
   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);
+  virtual void GetTextExtent(const wxString& string, long *x, long *y,
+                     long *descent = NULL, long *externalLeading = NULL,
+                     wxFont *theFont = NULL, bool use16bit = FALSE) const;
 
   // Implementation
   inline wxMetaFile *GetMetaFile(void) { return m_metaFile; }
@@ -99,6 +99,6 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, float scale =
 // 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 // USE_METAFILE
+#endif // wxUSE_METAFILE
 #endif
-    // __METAFIILEH__
+    // _WX_METAFIILE_H_