fixed wxGetKeyState to get current status of non-togle keys, and to

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index 4cb723c388945aa770d5f0faee37563ba90b2252..1ebf5a728a6fbb21fb77d7f75e5581add5cea116 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMPRINT_H_
 #define _WX_HTMPRINT_H_
 
 #ifndef _WX_HTMPRINT_H_
 #define _WX_HTMPRINT_H_
 

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

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


@@ -152,6 +152,7 @@ public:
     bool HasPage(int page);
     void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
     bool OnBeginDocument(int startPage, int endPage);
     bool HasPage(int page);
     void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
     bool OnBeginDocument(int startPage, int endPage);

+    void OnPreparePrinting();

 
     // Adds input filter
     static void AddFilter(wxHtmlFilter *filter);
 
     // Adds input filter
     static void AddFilter(wxHtmlFilter *filter);


@@ -236,7 +237,7 @@ public:
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = 0);
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used)
 
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = 0);
     // Sets fonts to be used when displaying HTML page. (if size null then default sizes used)
 

-    wxPrintData *GetPrintData() {return m_PrintData;}
+    wxPrintData *GetPrintData();

     wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
             // return page setting data objects. 
             // (You can set their parameters.)
     wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
             // return page setting data objects. 
             // (You can set their parameters.)