Use m_children as it were std::vector

[wxWidgets.git] / include / wx / gtk / print.h

diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h
index 17e0c12e7f56d4ea7417b10947abdef86f6e340a..66f34f0702a8d4da53e48f4b23c086e7df3fcda6 100644 (file)
--- a/include/wx/gtk/print.h
+++ b/include/wx/gtk/print.h
@@ -53,11 +53,7 @@ public:
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL );
 
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL );
 

-#if wxUSE_NEW_DC

     virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
     virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );

-#else
-    virtual wxDC* CreatePrinterDC( const wxPrintData& data );
-#endif

 
     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
 
     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );


@@ -222,24 +218,17 @@ private:
 // wxGtkPrinterDC
 //-----------------------------------------------------------------------------
 
 // wxGtkPrinterDC
 //-----------------------------------------------------------------------------
 

-#if wxUSE_NEW_DC

 class WXDLLIMPEXP_CORE wxGtkPrinterDCImpl : public wxDCImpl
 class WXDLLIMPEXP_CORE wxGtkPrinterDCImpl : public wxDCImpl

-#else
-#define wxGtkPrinterDCImpl wxGtkPrinterDC
-class WXDLLIMPEXP_CORE wxGtkPrinterDC : public wxDC
-#endif

 {
 public:
 {
 public:

-#if wxUSE_NEW_DC

     wxGtkPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
     wxGtkPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );

-#else
-    wxGtkPrinterDC( const wxPrintData& data );
-#endif

     virtual ~wxGtkPrinterDCImpl();
 
     bool Ok() const { return IsOk(); }
     bool IsOk() const;
 
     virtual ~wxGtkPrinterDCImpl();
 
     bool Ok() const { return IsOk(); }
     bool IsOk() const;
 

+    virtual void* GetCairoContext() const;
+

     bool CanDrawBitmap() const { return true; }
     void Clear();
     void SetFont( const wxFont& font );
     bool CanDrawBitmap() const { return true; }
     void Clear();
     void SetFont( const wxFont& font );


@@ -292,7 +281,10 @@ protected:
     void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
     void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
     void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
     void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
     void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

-    void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) { }
+    void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip) )
+    {
+        wxFAIL_MSG( "not implemented" );
+    }

     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                      wxCoord *descent = (wxCoord *) NULL,
                      wxCoord *externalLeading = (wxCoord *) NULL,
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                      wxCoord *descent = (wxCoord *) NULL,
                      wxCoord *externalLeading = (wxCoord *) NULL,


@@ -345,11 +337,16 @@ public:
     virtual void DetermineScaling();
 
 private:
     virtual void DetermineScaling();
 
 private:

-    void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
+    void Init(wxPrintout *printout,
+              wxPrintout *printoutForPrinting,
+              wxPrintData *data);
+
+    // resolution to use in DPI
+    int m_resolution;

 
     DECLARE_CLASS(wxGtkPrintPreview)
 };
 
 
     DECLARE_CLASS(wxGtkPrintPreview)
 };
 

-#endif
+#endif // wxUSE_GTKPRINT

 
 

-#endif
+#endif // _WX_GTK_PRINT_H_