wxPython updates (SWIG really works, cannot believe it)

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

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index b1b455853ae6fcc03bbd106e6f8a9d7f0c02dbb7..f484b7a925c163936b66e008582bdf2afb144b38 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __PRNTBASEH__
-#define __PRNTBASEH__
+#ifndef _WX_PRNTBASEH__
+#define _WX_PRNTBASEH__

 
 #ifdef __GNUG__
 #pragma interface "prntbase.h"
 
 #ifdef __GNUG__
 #pragma interface "prntbase.h"


@@ -22,6 +22,7 @@
 #include "wx/panel.h"
 #include "wx/scrolwin.h"
 #include "wx/dialog.h"
 #include "wx/panel.h"
 #include "wx/scrolwin.h"
 #include "wx/dialog.h"

+#include "wx/frame.h"

 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxButton;
 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxButton;


@@ -42,20 +43,14 @@ class WXDLLEXPORT wxPrinterBase: public wxObject
 {
   DECLARE_CLASS(wxPrinterBase)
 
 {
   DECLARE_CLASS(wxPrinterBase)
 

- protected:
-  wxPrintData printData;
-  wxPrintout *currentPrintout;
- public:
-  static  wxWindow *abortWindow;
-  static  bool abortIt;
-
-  wxPrinterBase(wxPrintData *data = NULL);
-  ~wxPrinterBase(void);
+public:
+  wxPrinterBase(wxPrintData *data = (wxPrintData *) NULL);
+  ~wxPrinterBase();

 
   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(void) { return printData; };
-  inline bool GetAbort(void) { return abortIt; }
+  inline wxPrintData& GetPrintData() { return m_printData; };
+  inline bool GetAbort() { return sm_abortIt; }

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


@@ -63,6 +58,14 @@ class WXDLLEXPORT wxPrinterBase: public wxObject
   virtual bool Setup(wxWindow *parent) = 0;
   virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE) = 0;
   virtual bool PrintDialog(wxWindow *parent) = 0;
   virtual bool Setup(wxWindow *parent) = 0;
   virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE) = 0;
   virtual bool PrintDialog(wxWindow *parent) = 0;

+
+protected:
+  wxPrintData           m_printData;
+  wxPrintout*           m_currentPrintout;
+public:
+  static wxWindow*      sm_abortWindow;
+  static bool           sm_abortIt;
+

 };
 
 /*
 };
 
 /*


@@ -77,55 +80,56 @@ class WXDLLEXPORT wxPrintout: public wxObject
 {
   DECLARE_ABSTRACT_CLASS(wxPrintout)
 
 {
   DECLARE_ABSTRACT_CLASS(wxPrintout)
 

- private:
-   char *printoutTitle;
-   wxDC *printoutDC;
-
-   int pageWidthPixels;
-   int pageHeightPixels;
-
-   int pageWidthMM;
-   int pageHeightMM;
-
-   int PPIScreenX;
-   int PPIScreenY;
-   int PPIPrinterX;
-   int PPIPrinterY;
-
-   bool isPreview;
- public:
-  wxPrintout(const char *title = "Printout");
-  ~wxPrintout(void);
+public:
+  wxPrintout(const wxString& title = "Printout");
+  ~wxPrintout();

 
   virtual bool OnBeginDocument(int startPage, int endPage);
 
   virtual bool OnBeginDocument(int startPage, int endPage);

-  virtual void OnEndDocument(void);
-  virtual void OnBeginPrinting(void);
-  virtual void OnEndPrinting(void);
+  virtual void OnEndDocument();
+  virtual void OnBeginPrinting();
+  virtual void OnEndPrinting();

 
   // Guaranteed to be before any other functions are called
 
   // Guaranteed to be before any other functions are called

-  inline virtual void OnPreparePrinting(void) { }
+  inline virtual void OnPreparePrinting() { }

 
   virtual bool HasPage(int page);
   virtual bool OnPrintPage(int page) = 0;
   virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
 
 
   virtual bool HasPage(int page);
   virtual bool OnPrintPage(int page) = 0;
   virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
 

-  inline virtual char *GetTitle(void) { return printoutTitle; }
+  inline virtual wxString GetTitle() { return m_printoutTitle; }
+
+  inline wxDC *GetDC() { 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 GetPageSizePixels(int *w, int  *h) { *w = m_pageWidthPixels; *h = m_pageHeightPixels; }
+  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 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 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 virtual bool IsPreview() { return m_isPreview; }
+
+  inline virtual void SetIsPreview(bool p) { m_isPreview = p; }
+
+private:
+   wxString         m_printoutTitle;
+   wxDC*            m_printoutDC;

 
 

-  inline wxDC *GetDC(void) { return printoutDC; }
-  inline void SetDC(wxDC *dc) { printoutDC = dc; }
-  inline void SetPageSizePixels(int w, int  h) { pageWidthPixels = w; pageHeightPixels = h; }
-  inline void GetPageSizePixels(int *w, int  *h) { *w = pageWidthPixels; *h = pageHeightPixels; }
-  inline void SetPageSizeMM(int w, int  h) { pageWidthMM = w; pageHeightMM = h; }
-  inline void GetPageSizeMM(int *w, int  *h) { *w = pageWidthMM; *h = pageHeightMM; }
+   int              m_pageWidthPixels;
+   int              m_pageHeightPixels;

 
 

-  inline void SetPPIScreen(int x, int y) { PPIScreenX = x; PPIScreenY = y; }
-  inline void GetPPIScreen(int *x, int *y) { *x = PPIScreenX; *y = PPIScreenY; }
-  inline void SetPPIPrinter(int x, int y) { PPIPrinterX = x; PPIPrinterY = y; }
-  inline void GetPPIPrinter(int *x, int *y) { *x = PPIPrinterX; *y = PPIPrinterY; }
+   int              m_pageWidthMM;
+   int              m_pageHeightMM;

 
 

-  inline virtual bool IsPreview(void) { return isPreview; }
+   int              m_PPIScreenX;
+   int              m_PPIScreenY;
+   int              m_PPIPrinterX;
+   int              m_PPIPrinterY;

 
 

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

 };
 
 /*
 };
 
 /*


@@ -137,19 +141,20 @@ class WXDLLEXPORT wxPreviewCanvas: public wxScrolledWindow
 {
   DECLARE_CLASS(wxPreviewCanvas)
 
 {
   DECLARE_CLASS(wxPreviewCanvas)
 

- private:
-  wxPrintPreviewBase *printPreview;
- public:
+public:

   wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = 0, const wxString& name = "canvas");
   wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = 0, const wxString& name = "canvas");

-  ~wxPreviewCanvas(void);
+  ~wxPreviewCanvas();

 
   void OnPaint(wxPaintEvent& event);
 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 
   void OnPaint(wxPaintEvent& event);
 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 

+private:
+  wxPrintPreviewBase*       m_printPreview;
+

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 


@@ -162,20 +167,21 @@ class WXDLLEXPORT wxPreviewFrame: public wxFrame
 {
   DECLARE_CLASS(wxPreviewFrame)
 
 {
   DECLARE_CLASS(wxPreviewFrame)
 

- protected:
-  wxWindow *previewCanvas;
-  wxPreviewControlBar *controlBar;
-  wxPrintPreviewBase *printPreview;
- public:
+public:

   wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, const wxString& title = "Print Preview",
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
   wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, const wxString& title = "Print Preview",
     const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-    long style = wxDEFAULT_FRAME, const wxString& name = "frame");
-  ~wxPreviewFrame(void);
-
-  bool OnClose(void);
-  virtual void Initialize(void);
-  virtual void CreateCanvas(void);
-  virtual void CreateControlBar(void);
+    long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
+  ~wxPreviewFrame();
+
+  bool OnClose();
+  virtual void Initialize();
+  virtual void CreateCanvas();
+  virtual void CreateControlBar();
+
+protected:
+  wxWindow*             m_previewCanvas;
+  wxPreviewControlBar*  m_controlBar;
+  wxPrintPreviewBase*   m_printPreview;

 };
 
 /*
 };
 
 /*


@@ -203,25 +209,16 @@ class WXDLLEXPORT wxPreviewControlBar: public wxPanel
 {
   DECLARE_CLASS(wxPreviewControlBar)
 
 {
   DECLARE_CLASS(wxPreviewControlBar)
 

- protected:
-  wxPrintPreviewBase *printPreview;
-  wxButton *closeButton;
-  wxButton *nextPageButton;
-  wxButton *previousPageButton;
-  wxButton *printButton;
-  wxChoice *zoomControl;
-  static wxFont *buttonFont;
-  long buttonFlags;
- public:
+public:

   wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
     wxWindow *parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = 0, const wxString& name = "panel");
   wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
     wxWindow *parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = 0, const wxString& name = "panel");

-  ~wxPreviewControlBar(void);
+  ~wxPreviewControlBar();

 
 

-  virtual void CreateButtons(void);
+  virtual void CreateButtons();

   virtual void SetZoomControl(int zoom);
   virtual void SetZoomControl(int zoom);

-  virtual int GetZoomControl(void);
-  inline virtual wxPrintPreviewBase *GetPrintPreview(void) { return printPreview; }
+  virtual int GetZoomControl();
+  inline virtual wxPrintPreviewBase *GetPrintPreview() const { return m_printPreview; }

 
   void OnPrint(wxCommandEvent& event);
   void OnClose(wxCommandEvent& event);
 
   void OnPrint(wxCommandEvent& event);
   void OnClose(wxCommandEvent& event);


@@ -230,6 +227,15 @@ class WXDLLEXPORT wxPreviewControlBar: public wxPanel
   void OnZoom(wxCommandEvent& event);
   void OnPaint(wxPaintEvent& event);
 
   void OnZoom(wxCommandEvent& event);
   void OnPaint(wxPaintEvent& event);
 

+protected:
+  wxPrintPreviewBase*   m_printPreview;
+  wxButton*             m_closeButton;
+  wxButton*             m_nextPageButton;
+  wxButton*             m_previousPageButton;
+  wxButton*             m_printButton;
+  wxChoice*             m_zoomControl;
+  long                  m_buttonFlags;
+

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 


@@ -242,40 +248,22 @@ class WXDLLEXPORT wxPrintPreviewBase: public wxObject
 {
   DECLARE_CLASS(wxPrintPreviewBase)
 
 {
   DECLARE_CLASS(wxPrintPreviewBase)
 

- protected:
-  wxPrintData printData;
-  wxWindow *previewCanvas;
-  wxFrame *previewFrame;
-  wxBitmap *previewBitmap;
-  wxPrintout *previewPrintout;
-  wxPrintout *printPrintout;
-  int currentPage;
-  int currentZoom;
-  float previewScale;
-  int topMargin;
-  int leftMargin;
-  int pageWidth;
-  int pageHeight;
-  int minPage;
-  int maxPage;
- protected:
-  bool isOk;
- public:
-  wxPrintPreviewBase(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
-  ~wxPrintPreviewBase(void);
+public:
+  wxPrintPreviewBase(wxPrintout *printout, wxPrintout *printoutForPrinting = (wxPrintout *) NULL, wxPrintData *data = (wxPrintData *) NULL);
+  ~wxPrintPreviewBase();

 
   virtual bool SetCurrentPage(int pageNum);
 
   virtual bool SetCurrentPage(int pageNum);

-  inline int GetCurrentPage(void) { return currentPage; };
+  inline int GetCurrentPage() const { return m_currentPage; };

 
 

-  inline void SetPrintout(wxPrintout *printout) { previewPrintout = printout; };
-  inline wxPrintout *GetPrintout(void) { return previewPrintout; };
-  inline wxPrintout *GetPrintoutForPrinting(void) { return printPrintout; };
+  inline void SetPrintout(wxPrintout *printout) { m_previewPrintout = printout; };
+  inline wxPrintout *GetPrintout() const { return m_previewPrintout; };
+  inline wxPrintout *GetPrintoutForPrinting() const { return m_printPrintout; };

 
 

-  inline void SetFrame(wxFrame *frame) { previewFrame = frame; };
-  inline void SetCanvas(wxWindow *canvas) { previewCanvas = canvas; };
+  inline void SetFrame(wxFrame *frame) { m_previewFrame = frame; };
+  inline void SetCanvas(wxWindow *canvas) { m_previewCanvas = canvas; };

 
 

-  inline virtual wxFrame *GetFrame(void) { return previewFrame; }
-  inline virtual wxWindow *GetCanvas(void) { return previewCanvas; }
+  inline virtual wxFrame *GetFrame() const { return m_previewFrame; }
+  inline virtual wxWindow *GetCanvas() const { return m_previewCanvas; }

 
   // The preview canvas should call this from OnPaint
   virtual bool PaintPage(wxWindow *canvas, wxDC& dc);
 
   // The preview canvas should call this from OnPaint
   virtual bool PaintPage(wxWindow *canvas, wxDC& dc);


@@ -287,16 +275,16 @@ class WXDLLEXPORT wxPrintPreviewBase: public wxObject
   // a wxMemoryDC.
   virtual bool RenderPage(int pageNum);
 
   // a wxMemoryDC.
   virtual bool RenderPage(int pageNum);
 

-  inline wxPrintData& GetPrintData(void) { return printData; }
+  inline wxPrintData& GetPrintData() { return m_printData; }

 
   virtual void SetZoom(int percent);
 
   virtual void SetZoom(int percent);

-  int GetZoom(void) { return currentZoom; };
+  inline int GetZoom() const { return m_currentZoom; };
+
+  inline int GetMaxPage() const { return m_maxPage; }
+  inline int GetMinPage() const { return m_minPage; }

 
 

-  inline int GetMaxPage(void) { return maxPage; }
-  inline int GetMinPage(void) { return minPage; }
-  
-  inline bool Ok(void) { return isOk; }
-  inline void SetOk(bool ok) { isOk = ok; }
+  inline bool Ok() const { return m_isOk; }
+  inline void SetOk(bool ok) { m_isOk = ok; }

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


@@ -309,7 +297,26 @@ class WXDLLEXPORT wxPrintPreviewBase: public wxObject
   // Calculate scaling that needs to be done to get roughly
   // the right scaling for the screen pretending to be
   // the currently selected printer.
   // Calculate scaling that needs to be done to get roughly
   // the right scaling for the screen pretending to be
   // the currently selected printer.

-  virtual void DetermineScaling(void) = 0;
+  virtual void DetermineScaling() = 0;
+
+protected:
+  wxPrintData       m_printData;
+  wxWindow*         m_previewCanvas;
+  wxFrame*          m_previewFrame;
+  wxBitmap*         m_previewBitmap;
+  wxPrintout*       m_previewPrintout;
+  wxPrintout*       m_printPrintout;
+  int               m_currentPage;
+  int               m_currentZoom;
+  float             m_previewScale;
+  int               m_topMargin;
+  int               m_leftMargin;
+  int               m_pageWidth;
+  int               m_pageHeight;
+  int               m_minPage;
+  int               m_maxPage;
+ protected:
+  bool              m_isOk;

 };
 
 /*
 };
 
 /*


@@ -319,8 +326,6 @@ class WXDLLEXPORT wxPrintPreviewBase: public wxObject
 class WXDLLEXPORT wxPrintAbortDialog: public wxDialog
 {
 public:
 class WXDLLEXPORT wxPrintAbortDialog: public wxDialog
 {
 public:

-    void OnCancel(wxCommandEvent& event);
-

   wxPrintAbortDialog(wxWindow *parent,
     const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = 0, const wxString& name = "dialog"):
   wxPrintAbortDialog(wxWindow *parent,
     const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     long style = 0, const wxString& name = "dialog"):


@@ -328,8 +333,10 @@ public:
   {
   }
 
   {
   }
 

+  void OnCancel(wxCommandEvent& event);
+

   DECLARE_EVENT_TABLE()
 };
 
 #endif
   DECLARE_EVENT_TABLE()
 };
 
 #endif

-    // __PRNTBASEH__
+    // _WX_PRNTBASEH__