added wxART_MISSING_IMAGE

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index ecff11db6dd4c059ad4f1d0306e9f4f78deae8ea..79f3528bb917dfcc97164db45cff9ec4cd0dffaf 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -11,11 +11,11 @@
 #ifndef _WX_HTMPRINT_H_
 #define _WX_HTMPRINT_H_
 
 #ifndef _WX_HTMPRINT_H_
 #define _WX_HTMPRINT_H_
 

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

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

-#include <wx/defs.h>
+#include "wx/defs.h"

 
 #if wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE
 
 
 #if wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE
 


@@ -74,6 +74,8 @@ private:
     wxFileSystem *m_FS;
     wxHtmlContainerCell *m_Cells;
     int m_MaxWidth, m_Width, m_Height;
     wxFileSystem *m_FS;
     wxHtmlContainerCell *m_Cells;
     int m_MaxWidth, m_Width, m_Height;

+
+    DECLARE_NO_COPY_CLASS(wxHtmlDCRenderer)

 };
 
 
 };
 
 


@@ -98,7 +100,7 @@ enum {
 class WXDLLEXPORT wxHtmlPrintout : public wxPrintout
 {
 public:
 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); 
     ~wxHtmlPrintout();
 
     void SetHtmlText(const wxString& html, const wxString &basepath = wxEmptyString, bool isdir = TRUE); 


@@ -155,6 +157,8 @@ private:
     int m_HeaderHeight, m_FooterHeight;
     wxHtmlDCRenderer *m_Renderer, *m_RendererHdr;
     float m_MarginTop, m_MarginBottom, m_MarginLeft, m_MarginRight, m_MarginSpace;
     int m_HeaderHeight, m_FooterHeight;
     wxHtmlDCRenderer *m_Renderer, *m_RendererHdr;
     float m_MarginTop, m_MarginBottom, m_MarginLeft, m_MarginRight, m_MarginSpace;

+
+    DECLARE_NO_COPY_CLASS(wxHtmlPrintout)

 };
 
 
 };
 
 


@@ -176,7 +180,7 @@ private:
 class WXDLLEXPORT wxHtmlEasyPrinting : public wxObject
 {
 public:
 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);
     ~wxHtmlEasyPrinting();
 
     bool PreviewFile(const wxString &htmlfile);


@@ -219,6 +223,8 @@ private:
     wxString m_Name;
     wxString m_Headers[2], m_Footers[2];
     wxFrame *m_Frame;
     wxString m_Name;
     wxString m_Headers[2], m_Footers[2];
     wxFrame *m_Frame;

+
+    DECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting)

 };
 
 
 };