#4479: wx.ComboBox needs a SetFont method

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index dd6c2e0f7934e4b0f7f258f28b5d858a088fe415..ef37bb4957cfaa5cc646dc01507225a575630518 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_HTML wxHtmlDCRenderer : public wxObject
 {
 public:
     wxHtmlDCRenderer();
 {
 public:
     wxHtmlDCRenderer();

-    ~wxHtmlDCRenderer();
+    virtual ~wxHtmlDCRenderer();

 
     // Following 3 methods *must* be called before any call to Render:
 
 
     // Following 3 methods *must* be called before any call to Render:
 


@@ -117,7 +117,7 @@ class WXDLLIMPEXP_HTML wxHtmlPrintout : public wxPrintout
 {
 public:
     wxHtmlPrintout(const wxString& title = wxT("Printout"));
 {
 public:
     wxHtmlPrintout(const wxString& title = wxT("Printout"));

-    ~wxHtmlPrintout();
+    virtual ~wxHtmlPrintout();

 
     void SetHtmlText(const wxString& html, const wxString &basepath = wxEmptyString, bool isdir = true);
             // prepares the class for printing this html document.
 
     void SetHtmlText(const wxString& html, const wxString &basepath = wxEmptyString, bool isdir = true);
             // prepares the class for printing this html document.


@@ -217,7 +217,7 @@ class WXDLLIMPEXP_HTML wxHtmlEasyPrinting : public wxObject
 {
 public:
     wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxWindow *parentWindow = NULL);
 {
 public:
     wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxWindow *parentWindow = NULL);

-    ~wxHtmlEasyPrinting();
+    virtual ~wxHtmlEasyPrinting();

 
     bool PreviewFile(const wxString &htmlfile);
     bool PreviewText(const wxString &htmltext, const wxString& basepath = wxEmptyString);
 
     bool PreviewFile(const wxString &htmlfile);
     bool PreviewText(const wxString &htmltext, const wxString& basepath = wxEmptyString);


@@ -256,6 +256,11 @@ public:
             // return page setting data objects.
             // (You can set their parameters.)
 
             // return page setting data objects.
             // (You can set their parameters.)
 

+    wxWindow* GetParentWindow() const { return m_ParentWindow; }
+            // get the parent window
+    void SetParentWindow(wxWindow* window) { m_ParentWindow = window; }
+            // set the parent window
+

 protected:
     virtual wxHtmlPrintout *CreatePrintout();
     virtual bool DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2);
 protected:
     virtual wxHtmlPrintout *CreatePrintout();
     virtual bool DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2);