#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
- #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/dcmemory.h"
+ #include "wx/math.h"
+ #include "wx/image.h"
+ #include "wx/icon.h"
#endif // WX_PRECOMP
-#include "wx/dcmemory.h"
-#include "wx/utils.h"
-#include "wx/image.h"
#include "wx/prntbase.h"
#include "wx/generic/prntdlgg.h"
#include "wx/paper.h"
#include "wx/filefn.h"
-#include "wx/math.h"
#include "wx/stdpaths.h"
+WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
+
#ifdef __WXMSW__
#ifdef DrawText
}
}
-bool wxPostScriptDC::Ok() const
+bool wxPostScriptDC::IsOk() const
{
return m_ok;
}
}
// print postscript datas via required method (file, stream)
-void wxPostScriptDC::PsPrintf( const wxChar* fmt, ... )
+void wxPostScriptDC::DoPsPrintfFormat(const wxChar *fmt, ... )
{
va_list argptr;
va_start(argptr, fmt);
- PsPrint( wxString::FormatV( fmt, argptr ).c_str() );
+ PsPrint( wxString::FormatV( fmt, argptr ) );
}
-void wxPostScriptDC::PsPrint( const char* psdata )
+void wxPostScriptDC::PsPrint( const wxString& str )
{
+ const wxWX2MBbuf psdata(str.mb_str(wxConvUTF8));
+
wxPostScriptPrintNativeData *data =
(wxPostScriptPrintNativeData *) m_printData.GetNativeData();