correct access for virtuals

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

diff --git a/samples/printing/printing.h b/samples/printing/printing.h
index 1b56be4d7097c5ab08aa101d01d19cf94a7de1ec..f3c2b6d98c3b99b2c7549993227bea8b21fb340e 100644 (file)
--- a/samples/printing/printing.h
+++ b/samples/printing/printing.h
@@ -1,26 +1,23 @@
-/*
- * File:       printing.h
- * Purpose:    Printing demo for wxWindows class library
- * Author:     Julian Smart
- * Created:    1995
- * Updated:    
- * Copyright:   (c) 1995, AIAI, University of Edinburgh
- */
-
-/* sccsid[] = "%W% %G%" */
-
-#ifdef __GNUG__
-#pragma interface
-#endif
+/////////////////////////////////////////////////////////////////////////////
+// Name:        printing.h
+// Purpose:     Printing demo for wxWidgets
+// Author:      Julian Smart
+// Modified by:
+// Created:     1995
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////

 
 // Define a new application
 class MyApp: public wxApp
 {
   public:
 
 // Define a new application
 class MyApp: public wxApp
 {
   public:

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

 
 

-    wxFont* m_testFont;
+    wxFont m_testFont;

 };
 
 DECLARE_APP(MyApp)
 };
 
 DECLARE_APP(MyApp)


@@ -32,21 +29,21 @@ class MyFrame: public wxFrame
 {
   public:
     MyCanvas *canvas;
 {
   public:
     MyCanvas *canvas;

+    wxBitmap m_bitmap;
+    int      m_angle;

     MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
 
     MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
 

-    bool OnClose(void);
-

     void Draw(wxDC& dc);
     void Draw(wxDC& dc);

+    void OnAngleUp(wxCommandEvent& event);
+    void OnAngleDown(wxCommandEvent& event);

 
     void OnSize(wxSizeEvent& event);
     void OnPrint(wxCommandEvent& event);
     void OnPrintPreview(wxCommandEvent& event);
 
     void OnSize(wxSizeEvent& event);
     void OnPrint(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 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);
 #endif
 
     void OnPageSetupPS(wxCommandEvent& event);
 #endif
 


@@ -60,7 +57,7 @@ class MyCanvas: public wxScrolledWindow
 {
   public:
     MyCanvas(wxFrame *frame, const wxPoint& pos, const wxSize& size, long style = wxRETAINED);
 {
   public:
     MyCanvas(wxFrame *frame, const wxPoint& pos, const wxSize& size, long style = wxRETAINED);

-    ~MyCanvas(void) ;
+    ~MyCanvas(void){};

 
     virtual void OnDraw(wxDC& dc);
     void OnEvent(wxMouseEvent& event);
 
     virtual void OnDraw(wxDC& dc);
     void OnEvent(wxMouseEvent& event);


@@ -71,7 +68,7 @@ DECLARE_EVENT_TABLE()
 class MyPrintout: public wxPrintout
 {
  public:
 class MyPrintout: public wxPrintout
 {
  public:

-  MyPrintout(char *title = "My printout"):wxPrintout(title) {}
+  MyPrintout(const wxChar *title = _T("My printout")):wxPrintout(title) {}

   bool OnPrintPage(int page);
   bool HasPage(int page);
   bool OnBeginDocument(int startPage, int endPage);
   bool OnPrintPage(int page);
   bool HasPage(int page);
   bool OnBeginDocument(int startPage, int endPage);


@@ -83,14 +80,14 @@ class MyPrintout: public wxPrintout
 
 #define WXPRINT_QUIT            100
 #define WXPRINT_PRINT           101
 
 #define WXPRINT_QUIT            100
 #define WXPRINT_PRINT           101

-#define WXPRINT_PRINT_SETUP     102

 #define WXPRINT_PAGE_SETUP      103
 #define WXPRINT_PREVIEW         104
 
 #define WXPRINT_PRINT_PS        105
 #define WXPRINT_PAGE_SETUP      103
 #define WXPRINT_PREVIEW         104
 
 #define WXPRINT_PRINT_PS        105

-#define WXPRINT_PRINT_SETUP_PS  106

 #define WXPRINT_PAGE_SETUP_PS   107
 #define WXPRINT_PREVIEW_PS      108
 
 #define WXPRINT_ABOUT           109
 
 #define WXPRINT_PAGE_SETUP_PS   107
 #define WXPRINT_PREVIEW_PS      108
 
 #define WXPRINT_ABOUT           109
 

+#define WXPRINT_ANGLEUP         110
+#define WXPRINT_ANGLEDOWN       111