added macros to avoid code repetition when defining comparison operators; use them...

[wxWidgets.git] / include / wx / generic / dcpsg.h

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index ddd9888e68ef114f64a35710a5e18c2544958a2f..e2f9770f69253d53b122feda41cdf9f95dcf0b40 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -11,15 +11,19 @@
 #ifndef _WX_DCPSG_H_
 #define _WX_DCPSG_H_
 
-#include "wx/dc.h"
+#include "wx/defs.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #if wxUSE_POSTSCRIPT
 
+#include "wx/dc.h"
 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"
+#include "wx/strvararg.h"
+
+extern WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
 
 //-----------------------------------------------------------------------------
 // classes
@@ -40,9 +44,10 @@ public:
     wxPostScriptDC(const wxPrintData& printData);
 
     // Recommended destructor :-)
-    ~wxPostScriptDC();
+    virtual ~wxPostScriptDC();
 
-  virtual bool Ok() const;
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk() const;
 
   bool CanDrawBitmap() const { return true; }
 
@@ -81,7 +86,7 @@ public:
   static void SetResolution(int ppi);
   static int GetResolution();
 
-  void PsPrintf( const wxChar* fmt, ... );
+  WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, DoPsPrintfFormat)
   void PsPrint( const char* psdata );
   void PsPrint( int ch );
 
@@ -90,6 +95,8 @@ public:
 #endif
 
 private:
+    void DoPsPrintfFormat(const wxChar *fmt, ... );
+
     static float ms_PSScaleFactor;
 
 protected: