Fixed bug #1163384. Moved the code that handles activating the cell

[wxWidgets.git] / include / wx / msw / printwin.h

diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index 9f7d368f7aa5e46a00b85f87fdf87ecbd5a43d73..6aef6a4d29818d52b37483d25403d2da1abf9a77 100644 (file)
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PRINTWIN_H_
 #define _WX_PRINTWIN_H_
 
 #ifndef _WX_PRINTWIN_H_
 #define _WX_PRINTWIN_H_
 

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

     #pragma interface "printwin.h"
 #endif
 
     #pragma interface "printwin.h"
 #endif
 


@@ -32,12 +32,14 @@ public:
 
     virtual bool Print(wxWindow *parent,
                        wxPrintout *printout,
 
     virtual bool Print(wxWindow *parent,
                        wxPrintout *printout,

-                       bool prompt = TRUE);
+                       bool prompt = true);

     virtual wxDC* PrintDialog(wxWindow *parent);
     virtual bool Setup(wxWindow *parent);
 
 private:
     WXFARPROC     m_lpAbortProc;
     virtual wxDC* PrintDialog(wxWindow *parent);
     virtual bool Setup(wxWindow *parent);
 
 private:
     WXFARPROC     m_lpAbortProc;

+
+    DECLARE_NO_COPY_CLASS(wxWindowsPrinter)

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -47,8 +49,6 @@ private:
 
 class WXDLLEXPORT wxWindowsPrintPreview : public wxPrintPreviewBase
 {
 
 class WXDLLEXPORT wxWindowsPrintPreview : public wxPrintPreviewBase
 {

-    DECLARE_CLASS(wxWindowsPrintPreview)
-

 public:
     wxWindowsPrintPreview(wxPrintout *printout,
                           wxPrintout *printoutForPrinting = NULL,
 public:
     wxWindowsPrintPreview(wxPrintout *printout,
                           wxPrintout *printoutForPrinting = NULL,


@@ -60,6 +60,9 @@ public:
 
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();

+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)

 };
 
 #endif
 };
 
 #endif