clean - reformatting

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

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 63d3c4bbab4447e3e8fe25cb6250a1df8a5064df..f5dad23ae79f60aca9360a4191be42720c0bd227 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -22,8 +22,6 @@
 
 #if wxUSE_POSTSCRIPT
 
 
 #if wxUSE_POSTSCRIPT
 

-#include "wx/setup.h"
-

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


@@ -1075,7 +1073,6 @@ void wxPostScriptDC::SetPen( const wxPen& pen )
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 

-        char buffer[100];

         sprintf( buffer,
             "%.8f %.8f %.8f setrgbcolor\n",
             redPS, greenPS, bluePS );
         sprintf( buffer,
             "%.8f %.8f %.8f setrgbcolor\n",
             redPS, greenPS, bluePS );


@@ -1352,7 +1349,6 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
         wxCoord w, h;
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
         wxCoord w, h;

-        char buffer[100];

         GetTextExtent(text, &w, &h);
 
         sprintf( buffer,
         GetTextExtent(text, &w, &h);
 
         sprintf( buffer,


@@ -1975,9 +1971,9 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         //     it just crashes
 #ifndef __WIN32__
         wxPostScriptPrintNativeData *data =
         //     it just crashes
 #ifndef __WIN32__
         wxPostScriptPrintNativeData *data =

-            (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+            wxDynamicCast(m_printData.GetNativeData(), wxPostScriptPrintNativeData);

 
 

-        if (!data->GetFontMetricPath().empty())
+        if (data && !data->GetFontMetricPath().empty())

         {
             afmName = data->GetFontMetricPath();
             afmName << wxFILE_SEP_PATH << name;
         {
             afmName = data->GetFontMetricPath();
             afmName << wxFILE_SEP_PATH << name;


@@ -1987,10 +1983,6 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         if ( !afmName.empty() )
             afmFile = wxFopen(afmName, wxT("r"));
 
         if ( !afmName.empty() )
             afmFile = wxFopen(afmName, wxT("r"));
 

-        if ( !afmFile )
-        {
-        }
-

         if ( !afmFile )
         {
 #if defined(__UNIX__) && !defined(__VMS__)
         if ( !afmFile )
         {
 #if defined(__UNIX__) && !defined(__VMS__)