Removed conflicting wxEntry prototype

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 71448016c7d89de593085d030d98e1ef5511b7e7..8ee27426378cf1c120574d34daffc58047298303 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -196,7 +196,7 @@ private:
 class WXDLLEXPORT wxHtmlEasyPrinting : public wxObject
 {
 public:
-    wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxFrame *parent_frame = NULL);
+    wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxWindow *parentWindow = NULL);
     ~wxHtmlEasyPrinting();
 
     bool PreviewFile(const wxString &htmlfile);
@@ -244,7 +244,7 @@ private:
     int *m_FontsSizes;
     wxString m_FontFaceFixed, m_FontFaceNormal;
     wxString m_Headers[2], m_Footers[2];
-    wxFrame *m_Frame;
+    wxWindow *m_ParentWindow;
 
     DECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting)
 };