avoid a bug in Carbon headers

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

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 8525fb46894fa2b51f5c34bed5c75c0a15579660..d7ed29ed22e001d45c8cf6122251b24d8a7f2c27 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PRNTBASEH__
 #define _WX_PRNTBASEH__
 
 #ifndef _WX_PRNTBASEH__
 #define _WX_PRNTBASEH__
 

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

     #pragma interface "prntbase.h"
 #endif
 
     #pragma interface "prntbase.h"
 #endif
 


@@ -171,6 +171,7 @@ public:
     ~wxPreviewCanvas();
 
     void OnPaint(wxPaintEvent& event);
     ~wxPreviewCanvas();
 
     void OnPaint(wxPaintEvent& event);

+    void OnChar(wxKeyEvent &event);

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


@@ -192,7 +193,7 @@ class WXDLLEXPORT wxPreviewFrame: public wxFrame
 {
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
 {
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,

-                   wxFrame *parent,
+                   wxWindow *parent,

                    const wxString& title = wxT("Print Preview"),
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    const wxString& title = wxT("Print Preview"),
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,


@@ -204,8 +205,11 @@ public:
     virtual void Initialize();
     virtual void CreateCanvas();
     virtual void CreateControlBar();
     virtual void Initialize();
     virtual void CreateCanvas();
     virtual void CreateControlBar();

+
+    inline wxPreviewControlBar* GetControlBar() const { return m_controlBar; }
+

 protected:
 protected:

-    wxWindow*             m_previewCanvas;
+    wxPreviewCanvas*      m_previewCanvas;

     wxPreviewControlBar*  m_controlBar;
     wxPrintPreviewBase*   m_printPreview;
 
     wxPreviewControlBar*  m_controlBar;
     wxPrintPreviewBase*   m_printPreview;
 


@@ -253,7 +257,7 @@ public:
                         wxWindow *parent,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         wxWindow *parent,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,

-                        long style = 0,
+                        long style = wxTAB_TRAVERSAL,

                         const wxString& name = wxT("panel"));
     ~wxPreviewControlBar();
 
                         const wxString& name = wxT("panel"));
     ~wxPreviewControlBar();
 


@@ -263,19 +267,19 @@ public:
     virtual wxPrintPreviewBase *GetPrintPreview() const
         { return m_printPreview; }
 
     virtual wxPrintPreviewBase *GetPrintPreview() const
         { return m_printPreview; }
 

-    void OnPrint(wxCommandEvent& event);

     void OnWindowClose(wxCommandEvent& event);
     void OnNext();
     void OnPrevious();
     void OnFirst();
     void OnLast();
     void OnGoto();
     void OnWindowClose(wxCommandEvent& event);
     void OnNext();
     void OnPrevious();
     void OnFirst();
     void OnLast();
     void OnGoto();

+    void OnPrint();
+    void OnPrintButton(wxCommandEvent& WXUNUSED(event)) { OnPrint(); }

     void OnNextButton(wxCommandEvent & WXUNUSED(event)) { OnNext(); }
     void OnPreviousButton(wxCommandEvent & WXUNUSED(event)) { OnPrevious(); }
     void OnFirstButton(wxCommandEvent & WXUNUSED(event)) { OnFirst(); }
     void OnLastButton(wxCommandEvent & WXUNUSED(event)) { OnLast(); }
     void OnGotoButton(wxCommandEvent & WXUNUSED(event)) { OnGoto(); }
     void OnNextButton(wxCommandEvent & WXUNUSED(event)) { OnNext(); }
     void OnPreviousButton(wxCommandEvent & WXUNUSED(event)) { OnPrevious(); }
     void OnFirstButton(wxCommandEvent & WXUNUSED(event)) { OnFirst(); }
     void OnLastButton(wxCommandEvent & WXUNUSED(event)) { OnLast(); }
     void OnGotoButton(wxCommandEvent & WXUNUSED(event)) { OnGoto(); }

-    void OnChar(wxKeyEvent &event);

     void OnZoom(wxCommandEvent& event);
     void OnPaint(wxPaintEvent& event);
 
     void OnZoom(wxCommandEvent& event);
     void OnPaint(wxPaintEvent& event);
 


@@ -322,16 +326,19 @@ public:
     wxPrintout *GetPrintoutForPrinting() const { return m_printPrintout; };
 
     void SetFrame(wxFrame *frame) { m_previewFrame = frame; };
     wxPrintout *GetPrintoutForPrinting() const { return m_printPrintout; };
 
     void SetFrame(wxFrame *frame) { m_previewFrame = frame; };

-    void SetCanvas(wxWindow *canvas) { m_previewCanvas = canvas; };
+    void SetCanvas(wxPreviewCanvas *canvas) { m_previewCanvas = canvas; };

 
     virtual wxFrame *GetFrame() const { return m_previewFrame; }
 
     virtual wxFrame *GetFrame() const { return m_previewFrame; }

-    virtual wxWindow *GetCanvas() const { return m_previewCanvas; }
+    virtual wxPreviewCanvas *GetCanvas() const { return m_previewCanvas; }

 
     // The preview canvas should call this from OnPaint
 
     // The preview canvas should call this from OnPaint

-    virtual bool PaintPage(wxWindow *canvas, wxDC& dc);
+    virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);

 
     // This draws a blank page onto the preview canvas
 
     // This draws a blank page onto the preview canvas

-    virtual bool DrawBlankPage(wxWindow *canvas, wxDC& dc);
+    virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
+
+    // Adjusts the scrollbars for the current scale
+    virtual void AdjustScrollbars(wxPreviewCanvas *canvas);

 
     // This is called by wxPrintPreview to render a page into a wxMemoryDC.
     virtual bool RenderPage(int pageNum);
 
     // This is called by wxPrintPreview to render a page into a wxMemoryDC.
     virtual bool RenderPage(int pageNum);


@@ -362,7 +369,7 @@ public:
 
 protected:
     wxPrintDialogData m_printDialogData;
 
 protected:
     wxPrintDialogData m_printDialogData;

-    wxWindow*         m_previewCanvas;
+    wxPreviewCanvas*  m_previewCanvas;

     wxFrame*          m_previewFrame;
     wxBitmap*         m_previewBitmap;
     wxPrintout*       m_previewPrintout;
     wxFrame*          m_previewFrame;
     wxBitmap*         m_previewBitmap;
     wxPrintout*       m_previewPrintout;


@@ -407,6 +414,7 @@ public:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPrintAbortDialog)

 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE