remove miniframe stuff from GtkOnSize(), it's handled by wxFrame

[wxWidgets.git] / src / generic / dcpsg.cpp

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 266b12c3a8379f52e121b1a906900602e70fd214..805fe0fd82e20f1035393e10cacf58c920800168 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -22,19 +22,21 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

-    #include "wx/app.h"

     #include "wx/utils.h"
     #include "wx/utils.h"

+    #include "wx/dcmemory.h"
+    #include "wx/math.h"
+    #include "wx/image.h"
+    #include "wx/icon.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/dcmemory.h"
-#include "wx/image.h"

 #include "wx/prntbase.h"
 #include "wx/generic/prntdlgg.h"
 #include "wx/paper.h"
 #include "wx/filefn.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"
 
 #include "wx/stdpaths.h"
 

+WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
+

 #ifdef __WXMSW__
 
 #ifdef DrawText
 #ifdef __WXMSW__
 
 #ifdef DrawText


@@ -302,7 +304,7 @@ wxPostScriptDC::~wxPostScriptDC ()
     }
 }
 
     }
 }
 

-bool wxPostScriptDC::Ok() const
+bool wxPostScriptDC::IsOk() const

 {
   return m_ok;
 }
 {
   return m_ok;
 }


@@ -1833,11 +1835,11 @@ wxCoord wxPostScriptDC::GetCharHeight() const
 void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                                      wxCoord *x, wxCoord *y,
                                      wxCoord *descent, wxCoord *externalLeading,
 void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                                      wxCoord *x, wxCoord *y,
                                      wxCoord *descent, wxCoord *externalLeading,

-                                     wxFont *theFont ) const
+                                     const wxFont *theFont ) const

 {
 {

-    wxFont *fontToUse = theFont;
+    const wxFont *fontToUse = theFont;

 
 

-    if (!fontToUse) fontToUse = (wxFont*) &m_font;
+    if (!fontToUse) fontToUse = &m_font;

 
     wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
 
 
     wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
 


@@ -2199,16 +2201,18 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 }
 
 // print postscript datas via required method (file, stream)
 }
 
 // print postscript datas via required method (file, stream)

-void wxPostScriptDC::PsPrintf( const wxChar* fmt, ... )
+void wxPostScriptDC::DoPsPrintfFormat(const wxString& fmt, ...)

 {
     va_list argptr;
     va_start(argptr, 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();
 
     wxPostScriptPrintNativeData *data =
         (wxPostScriptPrintNativeData *) m_printData.GetNativeData();