X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6adaedf0fc6607ee5bb4e86358396e5e07c6649f..69fb24ce03b4dd40e7912936d628bea1719aaaa3:/samples/printing/printing.h

diff --git a/samples/printing/printing.h b/samples/printing/printing.h
index 13933bb91f..9ccd72a277 100644
--- a/samples/printing/printing.h
+++ b/samples/printing/printing.h
@@ -1,6 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        printing.h
-// Purpose:     Printing demo for wxWindows
+// Name:        samples/printing.h
+
+// Purpose:     Printing demo for wxWidgets
 // Author:      Julian Smart
 // Modified by:
 // Created:     1995
@@ -9,19 +10,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 // Define a new application
 class MyApp: public wxApp
 {
   public:
-    MyApp() ;
+    MyApp(){};
     bool OnInit();
     int OnExit();
 
-    wxFont* m_testFont;
+    wxFont m_testFont;
 };
 
 DECLARE_APP(MyApp)
@@ -33,21 +30,26 @@ class MyFrame: public wxFrame
 {
   public:
     MyCanvas *canvas;
+    wxBitmap m_bitmap;
+    int      m_angle;
     MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size);
 
     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 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);
 #endif
+#ifdef __WXMAC__
+    void OnPageMargins(wxCommandEvent& event);
+#endif
 
     void OnExit(wxCommandEvent& event);
     void OnPrintAbout(wxCommandEvent& event);
@@ -59,7 +61,7 @@ class MyCanvas: public wxScrolledWindow
 {
   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);
@@ -70,26 +72,32 @@ DECLARE_EVENT_TABLE()
 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);
   void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
 
-  void DrawPageOne(wxDC *dc);
-  void DrawPageTwo(wxDC *dc);
+  void DrawPageOne();
+
+  void DrawPageTwo();
+
 };
 
 #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_PRINT_SETUP_PS  106
 #define WXPRINT_PAGE_SETUP_PS   107
 #define WXPRINT_PREVIEW_PS      108
 
 #define WXPRINT_ABOUT           109
 
+#define WXPRINT_ANGLEUP         110
+#define WXPRINT_ANGLEDOWN       111
+
+#ifdef __WXMAC__
+    #define WXPRINT_PAGE_MARGINS 112
+#endif