Bitmap button updates

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

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 98e4ce8f0a75b4cf8c25402e7ab9293bdb10cd1f..688a95748112238ff2f591ca63b8b69fc3e65754 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,6 +38,15 @@ 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
  */
 /*
  * Represents the printer: manages printing a wxPrintout object
  */


@@ -51,11 +60,13 @@ public:
     virtual ~wxPrinterBase();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
     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,6 +78,9 @@ 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;


@@ -189,7 +203,6 @@ public:
     virtual void Initialize();
     virtual void CreateCanvas();
     virtual void CreateControlBar();
     virtual void Initialize();
     virtual void CreateCanvas();
     virtual void CreateControlBar();

-

 protected:
     wxWindow*             m_previewCanvas;
     wxPreviewControlBar*  m_controlBar;
 protected:
     wxWindow*             m_previewCanvas;
     wxPreviewControlBar*  m_controlBar;


@@ -210,8 +223,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


@@ -219,6 +236,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
 {


@@ -242,8 +262,17 @@ public:
 
     void OnPrint(wxCommandEvent& event);
     void OnWindowClose(wxCommandEvent& event);
 
     void OnPrint(wxCommandEvent& event);
     void OnWindowClose(wxCommandEvent& event);

-    void OnNext(wxCommandEvent& event);
-    void OnPrevious(wxCommandEvent& event);
+    void OnNext();
+    void 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 OnZoom(wxCommandEvent& event);
     void OnPaint(wxPaintEvent& event);
 


@@ -254,6 +283,9 @@ 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:
     long                  m_buttonFlags;
 
 private:


@@ -342,6 +374,7 @@ protected:
     int               m_maxPage;
 
     bool              m_isOk;
     int               m_maxPage;
 
     bool              m_isOk;

+    bool              m_printingPrepared; // Called OnPreparePrinting?

 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);