another compilation fix for over-optimized #includes

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

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index ebc51df02714306131fe42a565a744ae9e8fb44a..8e926ce966c5f403f2f69bf86563911e3c928087 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__
 

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

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


@@ -38,24 +38,33 @@ class WXDLLEXPORT wxPreviewCanvas;
 class WXDLLEXPORT wxPreviewControlBar;
 class WXDLLEXPORT wxPreviewFrame;
 
 class WXDLLEXPORT wxPreviewControlBar;
 class WXDLLEXPORT wxPreviewFrame;
 

+
+enum wxPrinterError
+{
+    wxPRINTER_NO_ERROR = 0,
+    wxPRINTER_CANCELLED,
+    wxPRINTER_ERROR
+};
+
+

 /*
  * Represents the printer: manages printing a wxPrintout object
  */
 
 class WXDLLEXPORT wxPrinterBase: public wxObject
 {
 /*
  * Represents the printer: manages printing a wxPrintout object
  */
 
 class WXDLLEXPORT wxPrinterBase: public wxObject
 {

-    DECLARE_CLASS(wxPrinterBase)
-

 public:
     wxPrinterBase(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     virtual ~wxPrinterBase();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
 public:
     wxPrinterBase(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     virtual ~wxPrinterBase();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);

-    virtual void ReportError(wxWindow *parent, wxPrintout *printout, char *message);
+    virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);

 
     wxPrintDialogData& GetPrintDialogData() const
         { return (wxPrintDialogData&) m_printDialogData; }
     bool GetAbort() const { return sm_abortIt; }
 
     wxPrintDialogData& GetPrintDialogData() const
         { return (wxPrintDialogData&) m_printDialogData; }
     bool GetAbort() const { return sm_abortIt; }

+    
+    static wxPrinterError GetLastError() { return sm_lastError; }

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


@@ -67,10 +76,16 @@ public:
 protected:
     wxPrintDialogData     m_printDialogData;
     wxPrintout*           m_currentPrintout;
 protected:
     wxPrintDialogData     m_printDialogData;
     wxPrintout*           m_currentPrintout;

+    
+    static wxPrinterError sm_lastError;
+    

 public:
     static wxWindow*      sm_abortWindow;
     static bool           sm_abortIt;
 
 public:
     static wxWindow*      sm_abortWindow;
     static bool           sm_abortIt;
 

+private:
+    DECLARE_CLASS(wxPrinterBase)
+    DECLARE_NO_COPY_CLASS(wxPrinterBase)

 };
 
 /*
 };
 
 /*


@@ -83,10 +98,8 @@ public:
 
 class WXDLLEXPORT wxPrintout: public wxObject
 {
 
 class WXDLLEXPORT wxPrintout: public wxObject
 {

-DECLARE_ABSTRACT_CLASS(wxPrintout)
-

 public:
 public:

-    wxPrintout(const wxString& title = "Printout");
+    wxPrintout(const wxString& title = wxT("Printout"));

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


@@ -135,6 +148,10 @@ private:
     int              m_PPIPrinterY;
 
     bool             m_isPreview;
     int              m_PPIPrinterY;
 
     bool             m_isPreview;

+
+private:
+    DECLARE_ABSTRACT_CLASS(wxPrintout)
+    DECLARE_NO_COPY_CLASS(wxPrintout)

 };
 
 /*
 };
 
 /*


@@ -144,15 +161,13 @@ private:
 
 class WXDLLEXPORT wxPreviewCanvas: public wxScrolledWindow
 {
 
 class WXDLLEXPORT wxPreviewCanvas: public wxScrolledWindow
 {

-    DECLARE_CLASS(wxPreviewCanvas)
-

 public:
     wxPreviewCanvas(wxPrintPreviewBase *preview,
                     wxWindow *parent,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
 public:
     wxPreviewCanvas(wxPrintPreviewBase *preview,
                     wxWindow *parent,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,

-                    const wxString& name = "canvas");
+                    const wxString& name = wxT("canvas"));

     ~wxPreviewCanvas();
 
     void OnPaint(wxPaintEvent& event);
     ~wxPreviewCanvas();
 
     void OnPaint(wxPaintEvent& event);


@@ -163,7 +178,9 @@ public:
 private:
     wxPrintPreviewBase* m_printPreview;
 
 private:
     wxPrintPreviewBase* m_printPreview;
 

+    DECLARE_CLASS(wxPreviewCanvas)

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPreviewCanvas)

 };
 
 /*
 };
 
 /*


@@ -173,16 +190,14 @@ private:
 
 class WXDLLEXPORT wxPreviewFrame: public wxFrame
 {
 
 class WXDLLEXPORT wxPreviewFrame: public wxFrame
 {

-    DECLARE_CLASS(wxPreviewFrame)
-

 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
                    wxFrame *parent,
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
                    wxFrame *parent,

-                   const wxString& title = "Print Preview",
+                   const wxString& title = wxT("Print Preview"),

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE,

-                   const wxString& name = "frame");
+                   const wxString& name = wxT("frame"));

     ~wxPreviewFrame();
 
     void OnCloseWindow(wxCloseEvent& event);
     ~wxPreviewFrame();
 
     void OnCloseWindow(wxCloseEvent& event);


@@ -195,7 +210,9 @@ protected:
     wxPrintPreviewBase*   m_printPreview;
 
 private:
     wxPrintPreviewBase*   m_printPreview;
 
 private:

+    DECLARE_CLASS(wxPreviewFrame)

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPreviewFrame)

 };
 
 /*
 };
 
 /*


@@ -209,8 +226,12 @@ private:
 #define wxPREVIEW_PREVIOUS     2
 #define wxPREVIEW_NEXT         4
 #define wxPREVIEW_ZOOM         8
 #define wxPREVIEW_PREVIOUS     2
 #define wxPREVIEW_NEXT         4
 #define wxPREVIEW_ZOOM         8

+#define wxPREVIEW_FIRST       16
+#define wxPREVIEW_LAST        32
+#define wxPREVIEW_GOTO        64

 
 

-#define wxPREVIEW_DEFAULT      wxPREVIEW_PREVIOUS|wxPREVIEW_NEXT|wxPREVIEW_ZOOM
+#define wxPREVIEW_DEFAULT  wxPREVIEW_PREVIOUS|wxPREVIEW_NEXT|wxPREVIEW_ZOOM\
+                          |wxPREVIEW_FIRST|wxPREVIEW_GOTO|wxPREVIEW_LAST

 
 // Ids for controls
 #define wxID_PREVIEW_CLOSE      1
 
 // Ids for controls
 #define wxID_PREVIEW_CLOSE      1


@@ -218,6 +239,9 @@ private:
 #define wxID_PREVIEW_PREVIOUS   3
 #define wxID_PREVIEW_PRINT      4
 #define wxID_PREVIEW_ZOOM       5
 #define wxID_PREVIEW_PREVIOUS   3
 #define wxID_PREVIEW_PRINT      4
 #define wxID_PREVIEW_ZOOM       5

+#define wxID_PREVIEW_FIRST      6
+#define wxID_PREVIEW_LAST       7
+#define wxID_PREVIEW_GOTO       8

 
 class WXDLLEXPORT wxPreviewControlBar: public wxPanel
 {
 
 class WXDLLEXPORT wxPreviewControlBar: public wxPanel
 {


@@ -230,7 +254,7 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = 0,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = 0,

-                        const wxString& name = "panel");
+                        const wxString& name = wxT("panel"));

     ~wxPreviewControlBar();
 
     virtual void CreateButtons();
     ~wxPreviewControlBar();
 
     virtual void CreateButtons();


@@ -243,8 +267,14 @@ public:
     void OnWindowClose(wxCommandEvent& event);
     void OnNext();
     void OnPrevious();
     void OnWindowClose(wxCommandEvent& event);
     void OnNext();
     void OnPrevious();

-    void OnNextButton(wxCommandEvent &event) { OnNext(); }
-    void OnPreviousButton(wxCommandEvent &event) { OnPrevious(); }
+    void OnFirst();
+    void OnLast();
+    void 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 OnChar(wxKeyEvent &event);
     void OnZoom(wxCommandEvent& event);
     void OnPaint(wxPaintEvent& event);


@@ -256,10 +286,14 @@ protected:
     wxButton*             m_previousPageButton;
     wxButton*             m_printButton;
     wxChoice*             m_zoomControl;
     wxButton*             m_previousPageButton;
     wxButton*             m_printButton;
     wxChoice*             m_zoomControl;

+    wxButton*             m_firstPageButton;
+    wxButton*             m_lastPageButton;
+    wxButton*             m_gotoPageButton;

     long                  m_buttonFlags;
 
 private:
     DECLARE_EVENT_TABLE()
     long                  m_buttonFlags;
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPreviewControlBar)

 };
 
 /*
 };
 
 /*


@@ -348,6 +382,8 @@ protected:
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);

+
+    DECLARE_NO_COPY_CLASS(wxPrintPreviewBase)

 };
 
 /*
 };
 
 /*


@@ -362,7 +398,7 @@ public:
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = 0,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = 0,

-                       const wxString& name = "dialog")
+                       const wxString& name = wxT("dialog"))

         : wxDialog(parent, -1, title, pos, size, style, name)
         {
         }
         : wxDialog(parent, -1, title, pos, size, style, name)
         {
         }