The Great wxRegion Refactoring:

[wxWidgets.git] / src / mac / classic / dcprint.cpp

diff --git a/src/mac/classic/dcprint.cpp b/src/mac/classic/dcprint.cpp
index e875cb038765a608a9f1425c0e646392a5435195..03f81738aff0b4794afa7d81a5e50f5fcb693139 100644 (file)
--- a/src/mac/classic/dcprint.cpp
+++ b/src/mac/classic/dcprint.cpp
@@ -1,37 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcprint.cpp
+// Name:        src/mac/classic/dcprint.cpp

 // Purpose:     wxPrinterDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxPrinterDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dcprint.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#include "wx/dcprint.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/msgdlg.h"
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/dcprint.h"
-#include "wx/msgdlg.h"
-#include <math.h>

 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)

-#endif

 
 class wxNativePrinterDC
 {
 
 class wxNativePrinterDC
 {


@@ -57,7 +52,7 @@ class wxMacCarbonPrinterDC : public wxNativePrinterDC
 {
 public :
     wxMacCarbonPrinterDC( wxPrintData* data ) ;
 {
 public :
     wxMacCarbonPrinterDC( wxPrintData* data ) ;

-    ~wxMacCarbonPrinterDC() ;
+    virtual ~wxMacCarbonPrinterDC() ;

     virtual bool StartDoc(  wxPrinterDC* dc , const wxString& message ) ;
     virtual void EndDoc( wxPrinterDC* dc ) ;
     virtual void StartPage( wxPrinterDC* dc ) ;
     virtual bool StartDoc(  wxPrinterDC* dc , const wxString& message ) ;
     virtual void EndDoc( wxPrinterDC* dc ) ;
     virtual void StartPage( wxPrinterDC* dc ) ;


@@ -190,7 +185,7 @@ class wxMacClassicPrinterDC : public wxNativePrinterDC
 {
 public :
     wxMacClassicPrinterDC( wxPrintData* data ) ;
 {
 public :
     wxMacClassicPrinterDC( wxPrintData* data ) ;

-    ~wxMacClassicPrinterDC() ;
+    virtual ~wxMacClassicPrinterDC() ;

     virtual bool StartDoc(  wxPrinterDC* dc , const wxString& message ) ;
     virtual void EndDoc( wxPrinterDC* dc ) ;
     virtual void StartPage( wxPrinterDC* dc ) ;
     virtual bool StartDoc(  wxPrinterDC* dc , const wxString& message ) ;
     virtual void EndDoc( wxPrinterDC* dc ) ;
     virtual void StartPage( wxPrinterDC* dc ) ;


@@ -306,7 +301,7 @@ void wxMacClassicPrinterDC::EndPage( wxPrinterDC* dc )
 
 wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
 {
 
 wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
 {

-    m_ok = FALSE ;
+    m_ok = false ;

     m_printData = printdata ;
     m_printData.ConvertToNative() ;
     m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ;
     m_printData = printdata ;
     m_printData.ConvertToNative() ;
     m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ;


@@ -412,5 +407,3 @@ void wxPrinterDC::DoGetSize(int *width, int *height) const
     if ( height )
         * height = m_nativePrinterDC->GetMaxY() ;
 }
     if ( height )
         * height = m_nativePrinterDC->GetMaxY() ;
 }

-
-