X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb6efdf2773463ceb0348ac99b9dac6f2c17727d..80752b57a9bbdfa7613a917d9ece00fc47677080:/include/wx/prntbase.h diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h index 290a10851f..73a5d46675 100644 --- a/include/wx/prntbase.h +++ b/include/wx/prntbase.h @@ -12,10 +12,6 @@ #ifndef _WX_PRNTBASEH__ #define _WX_PRNTBASEH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "prntbase.h" -#endif - #include "wx/defs.h" #if wxUSE_PRINTING_ARCHITECTURE @@ -99,6 +95,7 @@ public: static void SetPrintFactory( wxPrintFactory *factory ); static wxPrintFactory *GetFactory(); +private: static wxPrintFactory *m_factory; }; @@ -309,7 +306,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("canvas")); - ~wxPreviewCanvas(); + virtual ~wxPreviewCanvas(); void OnPaint(wxPaintEvent& event); void OnChar(wxKeyEvent &event); @@ -343,7 +340,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); - ~wxPreviewFrame(); + virtual ~wxPreviewFrame(); void OnCloseWindow(wxCloseEvent& event); virtual void Initialize(); @@ -404,7 +401,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxT("panel")); - ~wxPreviewControlBar(); + virtual ~wxPreviewControlBar(); virtual void CreateButtons(); virtual void SetZoomControl(int zoom); @@ -571,6 +568,7 @@ public: virtual void AdjustScrollbars(wxPreviewCanvas *canvas); virtual bool RenderPage(int pageNum); virtual void SetZoom(int percent); + virtual int GetZoom() const; virtual bool Print(bool interactive); virtual void DetermineScaling();