X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08680429a25d66e284c75f69f14fe8ca6ab15f72..dca92ddfbff8fc0a858ada23c4ece06cdbe229c8:/include/wx/prntbase.h

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 3307ba26af..290a10851f 100644
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -63,24 +63,24 @@ class WXDLLEXPORT wxPrintFactory
 public:
     wxPrintFactory() {}
     virtual ~wxPrintFactory() {}
-    
+
     virtual wxPrinterBase *CreatePrinter( wxPrintDialogData* data ) = 0;
-    
-    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
-                                                    wxPrintout *printout = NULL, 
+
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview,
+                                                    wxPrintout *printout = NULL,
                                                     wxPrintDialogData *data = NULL ) = 0;
-    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
-                                                    wxPrintout *printout, 
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview,
+                                                    wxPrintout *printout,
                                                     wxPrintData *data ) = 0;
 
-    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent,
                                                   wxPrintDialogData *data = NULL ) = 0;
-    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent,
                                                   wxPrintData *data ) = 0;
-                                                  
+
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL ) = 0;
-                                                  
+
     // What to do and what to show in the wxPrintDialog
     // a) Use the generic print setup dialog or a native one?
     virtual bool HasPrintSetupDialog() = 0;
@@ -94,9 +94,9 @@ public:
     virtual bool HasStatusLine() = 0;
     virtual wxString CreateStatusLine() = 0;
 
-                                                  
+
     virtual wxPrintNativeDataBase *CreatePrintNativeData() = 0;
-    
+
     static void SetPrintFactory( wxPrintFactory *factory );
     static wxPrintFactory *GetFactory();
     static wxPrintFactory *m_factory;
@@ -106,22 +106,22 @@ class WXDLLEXPORT wxNativePrintFactory: public wxPrintFactory
 {
 public:
     virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );
-    
-    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
-                                                    wxPrintout *printout = NULL, 
+
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview,
+                                                    wxPrintout *printout = NULL,
                                                     wxPrintDialogData *data = NULL );
-    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview,
                                                     wxPrintout *printout,
                                                     wxPrintData *data );
-                                                    
-    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent,
                                                   wxPrintDialogData *data = NULL );
-    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent,
                                                   wxPrintData *data );
-                                                  
+
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL );
-                                                  
+
     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
     virtual bool HasOwnPrintToFile();
@@ -129,7 +129,7 @@ public:
     virtual wxString CreatePrinterLine();
     virtual bool HasStatusLine();
     virtual wxString CreateStatusLine();
-    
+
     virtual wxPrintNativeDataBase *CreatePrintNativeData();
 };
 
@@ -142,14 +142,14 @@ class WXDLLEXPORT wxPrintNativeDataBase: public wxObject
 public:
     wxPrintNativeDataBase();
     virtual ~wxPrintNativeDataBase() {}
-    
+
     virtual bool TransferTo( wxPrintData &data ) = 0;
-    virtual bool TransferFrom( const wxPrintData &data ) = 0; 
-    
+    virtual bool TransferFrom( const wxPrintData &data ) = 0;
+
     virtual bool Ok() const = 0;
-    
+
     int  m_ref;
-    
+
 private:
     DECLARE_CLASS(wxPrintNativeDataBase)
     DECLARE_NO_COPY_CLASS(wxPrintNativeDataBase)
@@ -215,12 +215,12 @@ public:
     virtual bool Setup(wxWindow *parent);
     virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
     virtual wxDC* PrintDialog(wxWindow *parent);
-    
+
     virtual wxPrintDialogData& GetPrintDialogData() const;
 
 protected:
     wxPrinterBase    *m_pimpl;
-    
+
 private:
     DECLARE_CLASS(wxPrinter)
     DECLARE_NO_COPY_CLASS(wxPrinter)
@@ -313,11 +313,14 @@ public:
 
     void OnPaint(wxPaintEvent& event);
     void OnChar(wxKeyEvent &event);
-
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 private:
+#if wxUSE_MOUSEWHEEL
+    void OnMouseWheel(wxMouseEvent& event);
+#endif // wxUSE_MOUSEWHEEL
+
     wxPrintPreviewBase* m_printPreview;
 
     DECLARE_CLASS(wxPreviewCanvas)
@@ -376,8 +379,8 @@ private:
 #define wxPREVIEW_LAST        32
 #define wxPREVIEW_GOTO        64
 
-#define wxPREVIEW_DEFAULT  wxPREVIEW_PREVIOUS|wxPREVIEW_NEXT|wxPREVIEW_ZOOM\
-                          |wxPREVIEW_FIRST|wxPREVIEW_GOTO|wxPREVIEW_LAST
+#define wxPREVIEW_DEFAULT  (wxPREVIEW_PREVIOUS|wxPREVIEW_NEXT|wxPREVIEW_ZOOM\
+                            |wxPREVIEW_FIRST|wxPREVIEW_GOTO|wxPREVIEW_LAST)
 
 // Ids for controls
 #define wxID_PREVIEW_CLOSE      1
@@ -491,7 +494,7 @@ public:
     virtual int GetZoom() const;
 
     virtual wxPrintDialogData& GetPrintDialogData();
-    
+
     virtual int GetMaxPage() const;
     virtual int GetMinPage() const;
 
@@ -571,15 +574,15 @@ public:
 
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
-    
+
     virtual wxPrintDialogData& GetPrintDialogData();
-    
+
     virtual int GetMaxPage() const;
     virtual int GetMinPage() const;
 
     virtual bool Ok() const;
     virtual void SetOk(bool ok);
-    
+
 private:
     wxPrintPreviewBase *m_pimpl;