wxDC::StretchBlit() for wxMac and wxMSW (patch 1611973)

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 7d9ea915f347a1da5ff1718242d2312a78ba0fd1..e2f9770f69253d53b122feda41cdf9f95dcf0b40 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -21,6 +21,7 @@
 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"
 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"

+#include "wx/strvararg.h"

 
 extern WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
 
 
 extern WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
 


@@ -43,9 +44,10 @@ public:
     wxPostScriptDC(const wxPrintData& printData);
 
     // Recommended destructor :-)
     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; }
 
 
   bool CanDrawBitmap() const { return true; }
 


@@ -84,7 +86,7 @@ public:
   static void SetResolution(int ppi);
   static int GetResolution();
 
   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 );
 
   void PsPrint( const char* psdata );
   void PsPrint( int ch );
 


@@ -93,6 +95,8 @@ public:
 #endif
 
 private:
 #endif
 
 private:

+    void DoPsPrintfFormat(const wxChar *fmt, ... );
+

     static float ms_PSScaleFactor;
 
 protected:
     static float ms_PSScaleFactor;
 
 protected: