added wxMAKE_UNIQUE_NAME to wx/defs.h, use it in wx/debug.h

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 71448016c7d89de593085d030d98e1ef5511b7e7..eabe41acf4322d4857936938e893961f267264ea 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -33,7 +33,7 @@
 //                  portion of DC
 //--------------------------------------------------------------------------------
 
-class WXDLLEXPORT wxHtmlDCRenderer : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlDCRenderer : public wxObject
 {
 public:
     wxHtmlDCRenderer();
@@ -110,7 +110,7 @@ enum {
 //--------------------------------------------------------------------------------
 
 
-class WXDLLEXPORT wxHtmlPrintout : public wxPrintout
+class WXDLLIMPEXP_HTML wxHtmlPrintout : public wxPrintout
 {
 public:
     wxHtmlPrintout(const wxString& title = wxT("Printout"));
@@ -193,10 +193,10 @@ private:
 //                         stores page&printer settings in it.
 //--------------------------------------------------------------------------------
 
-class WXDLLEXPORT wxHtmlEasyPrinting : public wxObject
+class WXDLLIMPEXP_HTML 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)
 };