Dnd constant name changes because names like Copy can be #defined by other

[wxWidgets.git] / include / wx / postscrp.h

diff --git a/include/wx/postscrp.h b/include/wx/postscrp.h
index f9536aa0e80a858836e3cfc79a38f95b81ab3320..18c6fbc4302c682d3a2dd7aacca49fd402fe5d3e 100644 (file)
--- a/include/wx/postscrp.h
+++ b/include/wx/postscrp.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __POSTSCRPH__
-#define __POSTSCRPH__
+#ifndef _WX_POSTSCRPH__
+#define _WX_POSTSCRPH__
 
 #ifdef __GNUG__
 #pragma interface "postscrp.h"
@@ -29,13 +29,13 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
  public:
   // Create a printer DC
   wxPostScriptDC(void);
-  wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = NULL);
+  wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
 
   ~wxPostScriptDC(void);
 
-  bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = NULL);
+  bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
 
-  virtual bool PrinterDialog(wxWindow *parent = NULL);
+  virtual bool PrinterDialog(wxWindow *parent = (wxWindow *) NULL);
 
   inline virtual void BeginDrawing(void) {} ;
   inline virtual void EndDrawing(void) {} ;
@@ -99,8 +99,9 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
   long GetCharHeight(void);
   long GetCharWidth(void);
   void GetTextExtent(const wxString& string, long *x, long *y,
-                     long *descent = NULL, long *externalLeading = NULL,
-                     wxFont *theFont = NULL, bool use16 = FALSE);
+                     long *descent = (long *) NULL, 
+                                        long *externalLeading = (long *) NULL,
+                     wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE);
   virtual void SetLogicalOrigin(long x, long y);
   virtual void CalcBoundingBox(long x, long y);
 
@@ -272,7 +273,7 @@ class WXDLLEXPORT wxPrintPaperType: public wxObject
   int heightPixels;
   char *pageName;
 
-  wxPrintPaperType(const char *name = NULL, int wmm = 0, int hmm = 0, int wp = 0, int hp = 0);
+  wxPrintPaperType(const char *name = (const char *) NULL, int wmm = 0, int hmm = 0, int wp = 0, int hp = 0);
   ~wxPrintPaperType(void);
 };
 
@@ -295,4 +296,4 @@ WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 
 #endif // USE_POSTSCRIPT
 #endif
-        // __POSTSCRPH__
+        // _WX_POSTSCRPH__