X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2978621101b6b5ed4d745ece17402c6e86d6dd8b..05159a2750ed2cc5945a85bc5fc6849ad1a30e75:/include/wx/html/htmprint.h?ds=sidebyside diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h index ecff11db6d..713d1ef895 100644 --- a/include/wx/html/htmprint.h +++ b/include/wx/html/htmprint.h @@ -11,11 +11,11 @@ #ifndef _WX_HTMPRINT_H_ #define _WX_HTMPRINT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "htmprint.h" #endif -#include +#include "wx/defs.h" #if wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE @@ -98,7 +98,7 @@ enum { class WXDLLEXPORT wxHtmlPrintout : public wxPrintout { public: - wxHtmlPrintout(const wxString& title = "Printout"); + wxHtmlPrintout(const wxString& title = wxT("Printout")); ~wxHtmlPrintout(); void SetHtmlText(const wxString& html, const wxString &basepath = wxEmptyString, bool isdir = TRUE); @@ -176,7 +176,7 @@ private: class WXDLLEXPORT wxHtmlEasyPrinting : public wxObject { public: - wxHtmlEasyPrinting(const wxString& name = "Printing", wxFrame *parent_frame = NULL); + wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxFrame *parent_frame = NULL); ~wxHtmlEasyPrinting(); bool PreviewFile(const wxString &htmlfile);