replace 5 copies of size constraining code with one function

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index e2f9770f69253d53b122feda41cdf9f95dcf0b40..1958c18278584ae03d77d2fe23ce4fcfbcaa4ad5 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -87,13 +87,9 @@ public:
   static int GetResolution();
 
   WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, DoPsPrintfFormat)
-  void PsPrint( const char* psdata );
+  void PsPrint( const wxString& psdata );
   void PsPrint( int ch );
 
-#if wxUSE_UNICODE
-  void PsPrint( const wxChar* psdata ) { PsPrint( wxConvUTF8.cWX2MB( psdata ) ); }
-#endif
-
 private:
     void DoPsPrintfFormat(const wxChar *fmt, ... );
 
@@ -128,7 +124,7 @@ protected:
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                          wxCoord *descent = NULL,
                          wxCoord *externalLeading = NULL,
-                         wxFont *theFont = NULL) const;
+                         const wxFont *theFont = NULL) const;
     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;