WXUSINGDLL is defined when building samples on non-MSW platforms for simplicity,...

[wxWidgets.git] / include / wx / html / htmprint.h

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index eabe41acf4322d4857936938e893961f267264ea..1ebf5a728a6fbb21fb77d7f75e5581add5cea116 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMPRINT_H_
 #define _WX_HTMPRINT_H_
 
 #ifndef _WX_HTMPRINT_H_
 #define _WX_HTMPRINT_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "htmprint.h"
 #endif
 
 #pragma interface "htmprint.h"
 #endif
 


@@ -21,6 +21,7 @@
 
 #include "wx/html/htmlcell.h"
 #include "wx/html/winpars.h"
 
 #include "wx/html/htmlcell.h"
 #include "wx/html/winpars.h"

+#include "wx/html/htmlfilt.h"

 
 #include "wx/print.h"
 #include "wx/printdlg.h"
 
 #include "wx/print.h"
 #include "wx/printdlg.h"


@@ -151,6 +152,13 @@ public:
     bool HasPage(int page);
     void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
     bool OnBeginDocument(int startPage, int endPage);
     bool HasPage(int page);
     void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
     bool OnBeginDocument(int startPage, int endPage);

+    void OnPreparePrinting();
+
+    // Adds input filter
+    static void AddFilter(wxHtmlFilter *filter);
+
+    // Cleanup
+    static void CleanUpStatics();

 
 private:
 
 
 private:
 


@@ -174,6 +182,9 @@ private:
     wxHtmlDCRenderer *m_Renderer, *m_RendererHdr;
     float m_MarginTop, m_MarginBottom, m_MarginLeft, m_MarginRight, m_MarginSpace;
 
     wxHtmlDCRenderer *m_Renderer, *m_RendererHdr;
     float m_MarginTop, m_MarginBottom, m_MarginLeft, m_MarginRight, m_MarginSpace;
 

+    // list of HTML filters
+    static wxList m_Filters;
+

     DECLARE_NO_COPY_CLASS(wxHtmlPrintout)
 };
 
     DECLARE_NO_COPY_CLASS(wxHtmlPrintout)
 };
 


@@ -226,7 +237,7 @@ public:
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = 0);
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used)
 
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = 0);
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used)
 

-    wxPrintData *GetPrintData() {return m_PrintData;}
+    wxPrintData *GetPrintData();

     wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
             // return page setting data objects. 
             // (You can set their parameters.)
     wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
             // return page setting data objects. 
             // (You can set their parameters.)