use (new) wxAcceleratorEntry::Create() instead of recently deprecated wxGetAccelFromS...

[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 dfc39d45594e37ecbe6c77b4074b4d859b4b51e8..2cfdd1a81401d615141be335017bc146f5d8ddc5 100644 (file)
--- a/include/wx/mac/carbon/dcprint.h
+++ b/include/wx/mac/carbon/dcprint.h
@@ -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,9 +20,9 @@ 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 );
   ~wxPrinterDC();
   // Create a printer DC
   wxPrinterDC(const wxPrintData& printdata );
   ~wxPrinterDC();


@@ -36,11 +32,12 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;
     wxPrintData& GetPrintData() { return m_printData; }
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;
     wxPrintData& GetPrintData() { return m_printData; }

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

 #if wxMAC_USE_CORE_GRAPHICS
     void MacSetCGContext( void * cg ) ;
 #endif    
  protected:
 #if wxMAC_USE_CORE_GRAPHICS
     void MacSetCGContext( void * cg ) ;
 #endif    
  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