OpenGl updates (still gives warnings..)

[wxWidgets.git] / samples / printing / printing.h

diff --git a/samples/printing/printing.h b/samples/printing/printing.h
index b30050c231efed17db573c957eb9a9dcb595760a..d9df02dfbbe7f11b20e39ebca7a0cbc8ac2a1c2a 100644 (file)
--- a/samples/printing/printing.h
+++ b/samples/printing/printing.h
@@ -17,8 +17,9 @@
 class MyApp: public wxApp
 {
   public:
 class MyApp: public wxApp
 {
   public:

-    MyApp(void) ;
-    bool OnInit(void);
+    MyApp() ;
+    bool OnInit();
+    int OnExit();

 
     wxFont* m_testFont;
 };
 
     wxFont* m_testFont;
 };


@@ -34,8 +35,6 @@ class MyFrame: public wxFrame
     MyCanvas *canvas;
     MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
 
     MyCanvas *canvas;
     MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
 

-    bool OnClose(void);
-

     void Draw(wxDC& dc);
 
     void OnSize(wxSizeEvent& event);
     void Draw(wxDC& dc);
 
     void OnSize(wxSizeEvent& event);


@@ -43,10 +42,13 @@ class MyFrame: public wxFrame
     void OnPrintPreview(wxCommandEvent& event);
     void OnPrintSetup(wxCommandEvent& event);
     void OnPageSetup(wxCommandEvent& event);
     void OnPrintPreview(wxCommandEvent& event);
     void OnPrintSetup(wxCommandEvent& event);
     void OnPageSetup(wxCommandEvent& event);

+#if defined(__WXMSW__) && wxTEST_POSTSCRIPT_IN_MSW

     void OnPrintPS(wxCommandEvent& event);
     void OnPrintPreviewPS(wxCommandEvent& event);
     void OnPrintSetupPS(wxCommandEvent& event);
     void OnPageSetupPS(wxCommandEvent& event);
     void OnPrintPS(wxCommandEvent& event);
     void OnPrintPreviewPS(wxCommandEvent& event);
     void OnPrintSetupPS(wxCommandEvent& event);
     void OnPageSetupPS(wxCommandEvent& event);

+#endif
+

     void OnExit(wxCommandEvent& event);
     void OnPrintAbout(wxCommandEvent& event);
 DECLARE_EVENT_TABLE()
     void OnExit(wxCommandEvent& event);
     void OnPrintAbout(wxCommandEvent& event);
 DECLARE_EVENT_TABLE()