small optimizations: m_isWindow and m_isCommandEvent flags introduced

[wxWidgets.git] / include / wx / prntbase.h

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index f484b7a925c163936b66e008582bdf2afb144b38..c147a654973c0e4efe77ba0bf30ca9ba2cf5d528 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -49,8 +49,8 @@ public:
 
   virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
   virtual void ReportError(wxWindow *parent, wxPrintout *printout, char *message);
 
   virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
   virtual void ReportError(wxWindow *parent, wxPrintout *printout, char *message);

-  inline wxPrintData& GetPrintData() { return m_printData; };
-  inline bool GetAbort() { return sm_abortIt; }
+  inline wxPrintData& GetPrintData() const { return (wxPrintData&) m_printData; };
+  inline bool GetAbort() const { return sm_abortIt; }

 
   ///////////////////////////////////////////////////////////////////////////
   // OVERRIDES
 
   ///////////////////////////////////////////////////////////////////////////
   // OVERRIDES


@@ -96,21 +96,21 @@ public:
   virtual bool OnPrintPage(int page) = 0;
   virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
 
   virtual bool OnPrintPage(int page) = 0;
   virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
 

-  inline virtual wxString GetTitle() { return m_printoutTitle; }
+  inline virtual wxString GetTitle() const { return m_printoutTitle; }

 
 

-  inline wxDC *GetDC() { return m_printoutDC; }
+  inline wxDC *GetDC() const { return m_printoutDC; }

   inline void SetDC(wxDC *dc) { m_printoutDC = dc; }
   inline void SetPageSizePixels(int w, int  h) { m_pageWidthPixels = w; m_pageHeightPixels = h; }
   inline void SetDC(wxDC *dc) { m_printoutDC = dc; }
   inline void SetPageSizePixels(int w, int  h) { m_pageWidthPixels = w; m_pageHeightPixels = h; }

-  inline void GetPageSizePixels(int *w, int  *h) { *w = m_pageWidthPixels; *h = m_pageHeightPixels; }
+  inline void GetPageSizePixels(int *w, int  *h) const { *w = m_pageWidthPixels; *h = m_pageHeightPixels; }

   inline void SetPageSizeMM(int w, int  h) { m_pageWidthMM = w; m_pageHeightMM = h; }
   inline void SetPageSizeMM(int w, int  h) { m_pageWidthMM = w; m_pageHeightMM = h; }

-  inline void GetPageSizeMM(int *w, int  *h) { *w = m_pageWidthMM; *h = m_pageHeightMM; }
+  inline void GetPageSizeMM(int *w, int  *h) const { *w = m_pageWidthMM; *h = m_pageHeightMM; }

 
   inline void SetPPIScreen(int x, int y) { m_PPIScreenX = x; m_PPIScreenY = y; }
 
   inline void SetPPIScreen(int x, int y) { m_PPIScreenX = x; m_PPIScreenY = y; }

-  inline void GetPPIScreen(int *x, int *y) { *x = m_PPIScreenX; *y = m_PPIScreenY; }
+  inline void GetPPIScreen(int *x, int *y) const { *x = m_PPIScreenX; *y = m_PPIScreenY; }

   inline void SetPPIPrinter(int x, int y) { m_PPIPrinterX = x; m_PPIPrinterY = y; }
   inline void SetPPIPrinter(int x, int y) { m_PPIPrinterX = x; m_PPIPrinterY = y; }

-  inline void GetPPIPrinter(int *x, int *y) { *x = m_PPIPrinterX; *y = m_PPIPrinterY; }
+  inline void GetPPIPrinter(int *x, int *y) const { *x = m_PPIPrinterX; *y = m_PPIPrinterY; }

 
 

-  inline virtual bool IsPreview() { return m_isPreview; }
+  inline virtual bool IsPreview() const { return m_isPreview; }

 
   inline virtual void SetIsPreview(bool p) { m_isPreview = p; }
 
 
   inline virtual void SetIsPreview(bool p) { m_isPreview = p; }
 


@@ -173,7 +173,7 @@ public:
     long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
   ~wxPreviewFrame();
 
     long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
   ~wxPreviewFrame();
 

-  bool OnClose();
+  void OnCloseWindow(wxCloseEvent& event);

   virtual void Initialize();
   virtual void CreateCanvas();
   virtual void CreateControlBar();
   virtual void Initialize();
   virtual void CreateCanvas();
   virtual void CreateControlBar();


@@ -182,6 +182,8 @@ protected:
   wxWindow*             m_previewCanvas;
   wxPreviewControlBar*  m_controlBar;
   wxPrintPreviewBase*   m_printPreview;
   wxWindow*             m_previewCanvas;
   wxPreviewControlBar*  m_controlBar;
   wxPrintPreviewBase*   m_printPreview;

+
+DECLARE_EVENT_TABLE()

 };
 
 /*
 };
 
 /*


@@ -221,7 +223,7 @@ public:
   inline virtual wxPrintPreviewBase *GetPrintPreview() const { return m_printPreview; }
 
   void OnPrint(wxCommandEvent& event);
   inline virtual wxPrintPreviewBase *GetPrintPreview() const { return m_printPreview; }
 
   void OnPrint(wxCommandEvent& event);

-  void OnClose(wxCommandEvent& event);
+  void OnWindowClose(wxCommandEvent& event);

   void OnNext(wxCommandEvent& event);
   void OnPrevious(wxCommandEvent& event);
   void OnZoom(wxCommandEvent& event);
   void OnNext(wxCommandEvent& event);
   void OnPrevious(wxCommandEvent& event);
   void OnZoom(wxCommandEvent& event);