wxMac uses wxStandardPathsCF to mean wxStandardPaths in its wxBase

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

diff --git a/samples/printing/printing.h b/samples/printing/printing.h
index 13933bb91fa72c9ea2640df743ab8c131278d968..25e098350dd8e0b21fa577792e60ee37a82f5b5b 100644 (file)
--- a/samples/printing/printing.h
+++ b/samples/printing/printing.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printing.h
-// Purpose:     Printing demo for wxWindows
+// Purpose:     Printing demo for wxWidgets
 // Author:      Julian Smart
 // Modified by:
 // Created:     1995
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -17,11 +17,11 @@
 class MyApp: public wxApp
 {
   public:
-    MyApp() ;
+    MyApp(){};
     bool OnInit();
     int OnExit();
 
-    wxFont* m_testFont;
+    wxFont m_testFont;
 };
 
 DECLARE_APP(MyApp)
@@ -59,7 +59,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,7 +70,7 @@ DECLARE_EVENT_TABLE()
 class MyPrintout: public wxPrintout
 {
  public:
-  MyPrintout(char *title = "My printout"):wxPrintout(title) {}
+  MyPrintout(wxChar *title = _T("My printout")):wxPrintout(title) {}
   bool OnPrintPage(int page);
   bool HasPage(int page);
   bool OnBeginDocument(int startPage, int endPage);