X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..c2cde53a09d89e83f1556bd703b1164857cd0e0f:/include/wx/postscrp.h

diff --git a/include/wx/postscrp.h b/include/wx/postscrp.h
index 16f231d2c8..bd222d8715 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"
@@ -18,10 +18,31 @@
 
 #include "wx/dc.h"
 #include "wx/dialog.h"
+#include "wx/module.h"
 
-#if USE_POSTSCRIPT
+#if wxUSE_POSTSCRIPT
+
+// A module to allow initialization/cleanup of PostScript-related
+// things without calling these functions from app.cpp.
+
+class WXDLLEXPORT wxPostScriptModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxPostScriptModule)
+public:
+    wxPostScriptModule() {}
+    bool OnInit();
+    void OnExit();
+};
+
+#if wxUSE_IOSTREAMH
+#  include <fstream.h>
+#else
+#  include <fstream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
+#endif
 
-class WXDLLIMPORT ofstream;
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
   DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
@@ -29,13 +50,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) {} ;
@@ -62,20 +83,13 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
   void DrawRoundedRectangle(long x, long y, long width, long height, double radius = 20);
   void DrawEllipse(long x, long y, long width, long height);
 
-  // RR: I define these in wxDC, after all they all do the same everywhere
-
-#ifdef __WINDOWS__
-  // Splines
-  // 3-point spline
-  void DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3);
-  // Any number of control points - a list of pointers to wxPoints
   void DrawSpline(wxList *points);
-  void DrawSpline(int n, wxPoint points[]);
-#endif
-
-  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 +109,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);
 
@@ -171,15 +186,15 @@ enum {
 };// ps_action = PS_PREVIEW;
 
 // PostScript printer settings
-void WXDLLEXPORT wxSetPrinterCommand(char *cmd);
-void WXDLLEXPORT wxSetPrintPreviewCommand(char *cmd);
-void WXDLLEXPORT wxSetPrinterOptions(char *flags);
+void WXDLLEXPORT wxSetPrinterCommand(const char *cmd);
+void WXDLLEXPORT wxSetPrintPreviewCommand(const char *cmd);
+void WXDLLEXPORT wxSetPrinterOptions(const char *flags);
 void WXDLLEXPORT wxSetPrinterOrientation(int orientation);
 void WXDLLEXPORT wxSetPrinterScaling(double x, double y);
 void WXDLLEXPORT wxSetPrinterTranslation(long x, long y);
 void WXDLLEXPORT wxSetPrinterMode(int mode);
-void WXDLLEXPORT wxSetPrinterFile(char *f);
-void WXDLLEXPORT wxSetAFMPath(char *f);
+void WXDLLEXPORT wxSetPrinterFile(const char *f);
+void WXDLLEXPORT wxSetAFMPath(const char *f);
 
 // Get current values
 char* WXDLLEXPORT wxGetPrinterCommand(void);
@@ -220,17 +235,17 @@ class WXDLLEXPORT wxPrintSetupData: public wxObject
   wxPrintSetupData(void);
   ~wxPrintSetupData(void);
 
-  void SetPrinterCommand(char *cmd);
-  void SetPaperName(char *paper);
-  void SetPrintPreviewCommand(char *cmd);
-  void SetPrinterOptions(char *flags);
-  void SetPrinterFile(char *f);
+  void SetPrinterCommand(const char *cmd);
+  void SetPaperName(const char *paper);
+  void SetPrintPreviewCommand(const char *cmd);
+  void SetPrinterOptions(const char *flags);
+  void SetPrinterFile(const char *f);
   void SetPrinterOrientation(int orient);
   void SetPrinterScaling(double x, double y);
   void SetPrinterTranslation(long x, long y);
   // 1 = Preview, 2 = print to file, 3 = send to printer
   void SetPrinterMode(int mode);
-  void SetAFMPath(char *f);
+  void SetAFMPath(const char *f);
   void SetColour(bool col);
 
   // Get current values
@@ -268,7 +283,7 @@ class WXDLLEXPORT wxPrintPaperType: public wxObject
   int heightPixels;
   char *pageName;
 
-  wxPrintPaperType(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);
 };
 
@@ -283,12 +298,12 @@ class WXDLLEXPORT wxPrintPaperDatabase: public wxList
   void CreateDatabase(void);
   void ClearDatabase(void);
 
-  void AddPaperType(char *name, int wmm, int hmm, int wp, int hp);
-  wxPrintPaperType *FindPaperType(char *name);
+  void AddPaperType(const char *name, int wmm, int hmm, int wp, int hp);
+  wxPrintPaperType *FindPaperType(const char *name);
 };
 
 WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 
-#endif // USE_POSTSCRIPT
+#endif // wxUSE_POSTSCRIPT
 #endif
-        // __POSTSCRPH__
+        // _WX_POSTSCRPH__