mac cleanup

[wxWidgets.git] / include / wx / mac / carbon / dcprint.h

diff --git a/include/wx/mac/carbon/dcprint.h b/include/wx/mac/carbon/dcprint.h
index 0e2b5bcf0d32e75e115498bd0ef57bb498b632a2..79f8d3b2f750a8356ded45ca66977f9b2e033a22 100644 (file)
--- a/include/wx/mac/carbon/dcprint.h
+++ b/include/wx/mac/carbon/dcprint.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcprint.h
+// Name:        wx/mac/carbon/dcprint.h

 // Purpose:     wxPrinterDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxPrinterDC class
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcprint.h"
-#endif
-

 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 


@@ -24,21 +20,24 @@ class wxNativePrinterDC ;
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
  public:
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
  public:

+#if wxUSE_PRINTING_ARCHITECTURE

   DECLARE_CLASS(wxPrinterDC)
 
   DECLARE_CLASS(wxPrinterDC)
 

-#if wxUSE_PRINTING_ARCHITECTURE

   // Create a printer DC
   wxPrinterDC(const wxPrintData& printdata );
   // Create a printer DC
   wxPrinterDC(const wxPrintData& printdata );

-  ~wxPrinterDC();
+  virtual ~wxPrinterDC();

 
     virtual bool StartDoc( const wxString& WXUNUSED(message) ) ;
     virtual void EndDoc(void) ;
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;
 
     virtual bool StartDoc( const wxString& WXUNUSED(message) ) ;
     virtual void EndDoc(void) ;
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;

+
+    wxRect GetPaperRect();
+

     wxPrintData& GetPrintData() { return m_printData; }
     wxPrintData& GetPrintData() { return m_printData; }

-    virtual void DoGetSize( int *width, int *height ) const;
-    
+    virtual wxSize GetPPI() const;

  protected:
  protected:

+    virtual void DoGetSize( int *width, int *height ) const;

     wxPrintData   m_printData ;
     wxNativePrinterDC* m_nativePrinterDC ;
 #endif // wxUSE_PRINTING_ARCHITECTURE
     wxPrintData   m_printData ;
     wxNativePrinterDC* m_nativePrinterDC ;
 #endif // wxUSE_PRINTING_ARCHITECTURE