Reverted due to Darwin and other conflicts.

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

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 829d17f87a6a349b67118b8c75b282ca5d4abc68..7e5810d95c095314230d13c3574bb8753dfc6ecd 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -63,22 +63,22 @@ public:
     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
 
     virtual bool Setup(wxWindow *parent) = 0;
     static wxPrinterError GetLastError() { return sm_lastError; }
 
     ///////////////////////////////////////////////////////////////////////////
     // OVERRIDES
 
     virtual bool Setup(wxWindow *parent) = 0;

-    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE) = 0;
+    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) = 0;

     virtual wxDC* PrintDialog(wxWindow *parent) = 0;
 
 protected:
     wxPrintDialogData     m_printDialogData;
     wxPrintout*           m_currentPrintout;
     virtual wxDC* PrintDialog(wxWindow *parent) = 0;
 
 protected:
     wxPrintDialogData     m_printDialogData;
     wxPrintout*           m_currentPrintout;

-    
+

     static wxPrinterError sm_lastError;
     static wxPrinterError sm_lastError;

-    
+

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


@@ -197,7 +197,7 @@ public:
                    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,

-                   long style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE,
+                   long style = wxDEFAULT_FRAME_STYLE,

                    const wxString& name = wxT("frame"));
     ~wxPreviewFrame();
 
                    const wxString& name = wxT("frame"));
     ~wxPreviewFrame();
 


@@ -212,6 +212,7 @@ protected:
     wxPreviewCanvas*      m_previewCanvas;
     wxPreviewControlBar*  m_controlBar;
     wxPrintPreviewBase*   m_printPreview;
     wxPreviewCanvas*      m_previewCanvas;
     wxPreviewControlBar*  m_controlBar;
     wxPrintPreviewBase*   m_printPreview;

+    wxWindowDisabler*     m_windowDisabler;

 
 private:
     DECLARE_CLASS(wxPreviewFrame)
 
 private:
     DECLARE_CLASS(wxPreviewFrame)


@@ -406,7 +407,7 @@ public:
                        const wxSize& size = wxDefaultSize,
                        long style = 0,
                        const wxString& name = wxT("dialog"))
                        const wxSize& size = wxDefaultSize,
                        long style = 0,
                        const wxString& name = wxT("dialog"))

-        : wxDialog(parent, -1, title, pos, size, style, name)
+        : wxDialog(parent, wxID_ANY, title, pos, size, style, name)

         {
         }
 
         {
         }