wxMotif compilation fixes after wxDC changes

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

diff --git a/samples/printing/printing.h b/samples/printing/printing.h
index f3c2b6d98c3b99b2c7549993227bea8b21fb340e..9ccd72a277c772dac851c6d0c38fade2369bfc3e 100644 (file)
--- a/samples/printing/printing.h
+++ b/samples/printing/printing.h
@@ -1,5 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printing.h
+// Name:        samples/printing.h
+

 // Purpose:     Printing demo for wxWidgets
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Printing demo for wxWidgets
 // Author:      Julian Smart
 // Modified by:


@@ -46,6 +47,9 @@ class MyFrame: public wxFrame
     void OnPrintPreviewPS(wxCommandEvent& event);
     void OnPageSetupPS(wxCommandEvent& event);
 #endif
     void OnPrintPreviewPS(wxCommandEvent& event);
     void OnPageSetupPS(wxCommandEvent& event);
 #endif

+#ifdef __WXMAC__
+    void OnPageMargins(wxCommandEvent& event);
+#endif

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


@@ -74,8 +78,10 @@ class MyPrintout: public wxPrintout
   bool OnBeginDocument(int startPage, int endPage);
   void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
 
   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_QUIT            100


@@ -91,3 +97,7 @@ class MyPrintout: public wxPrintout
 
 #define WXPRINT_ANGLEUP         110
 #define WXPRINT_ANGLEDOWN       111
 
 #define WXPRINT_ANGLEUP         110
 #define WXPRINT_ANGLEDOWN       111

+
+#ifdef __WXMAC__
+    #define WXPRINT_PAGE_MARGINS 112
+#endif