renamed wxWave to wxSound; compatibility fixes

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

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 067ba6e9a01d2ff3cc35cff734a1c697de55037b..829d17f87a6a349b67118b8c75b282ca5d4abc68 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__
 

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

     #pragma interface "prntbase.h"
 #endif
 
     #pragma interface "prntbase.h"
 #endif
 


@@ -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,
+                   long style = wxDEFAULT_FRAME_STYLE|wxFULL_REPAINT_ON_RESIZE,

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


@@ -274,7 +274,7 @@ public:
     void OnLast();
     void OnGoto();
     void OnPrint();
     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(); }
     void OnNextButton(wxCommandEvent & WXUNUSED(event)) { OnNext(); }
     void OnPreviousButton(wxCommandEvent & WXUNUSED(event)) { OnPrevious(); }
     void OnFirstButton(wxCommandEvent & WXUNUSED(event)) { OnFirst(); }