Patch from Jed Burgess that optionally allows the grid to notify when

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

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 067ba6e9a01d2ff3cc35cff734a1c697de55037b..bc8df5fed0d95423e3883485e5a399a69f4d535c 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PRNTBASEH__
 #define _WX_PRNTBASEH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "prntbase.h"
 #endif
 
@@ -212,6 +212,7 @@ protected:
     wxPreviewCanvas*      m_previewCanvas;
     wxPreviewControlBar*  m_controlBar;
     wxPrintPreviewBase*   m_printPreview;
+    wxWindowDisabler*     m_windowDisabler;
 
 private:
     DECLARE_CLASS(wxPreviewFrame)
@@ -274,7 +275,7 @@ public:
     void OnLast();
     void OnGoto();
     void OnPrint();
-    void OnPrint(wxCommandEvent& WXUNUSED(event)) { OnPrint(); }
+    void OnPrintButton(wxCommandEvent& WXUNUSED(event)) { OnPrint(); }
     void OnNextButton(wxCommandEvent & WXUNUSED(event)) { OnNext(); }
     void OnPreviousButton(wxCommandEvent & WXUNUSED(event)) { OnPrevious(); }
     void OnFirstButton(wxCommandEvent & WXUNUSED(event)) { OnFirst(); }