X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a5a83677555023d476401bab5809a1107222c74..e55ad60e195f1007db921b2a73a3cac98ed9df65:/include/wx/postscrp.h

diff --git a/include/wx/postscrp.h b/include/wx/postscrp.h
index fb6cc90850..18c6fbc430 100644
--- 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) {} ;
@@ -76,6 +76,10 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
   void DrawOpenSpline(wxList *points);
 
   void DrawIcon(const wxIcon& icon, long x, long y);
+#ifdef __WXGTK__
+  void DrawIcon(const wxIcon& icon, long x, long y, bool WXUNUSED(usemask) ) 
+    { DrawIcon( icon, x, y ); }
+#endif
   void DrawText(const wxString& text, long x, long y, bool use16 = FALSE);
 
   void Clear(void);
@@ -95,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);
 
@@ -268,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);
 };
 
@@ -291,4 +296,4 @@ WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 
 #endif // USE_POSTSCRIPT
 #endif
-        // __POSTSCRPH__
+        // _WX_POSTSCRPH__