use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

[wxWidgets.git] / samples / png / pngdemo.h

diff --git a/samples/png/pngdemo.h b/samples/png/pngdemo.h
index eef3432f116cdd15892e314c0a8dbbd86fa96ce8..8267cecf60de720e2a79ad8614c734ef2d3ff797 100644 (file)
--- a/samples/png/pngdemo.h
+++ b/samples/png/pngdemo.h
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined( __GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -19,7 +19,7 @@
 class MyApp: public wxApp
 {
   public:
-    MyApp(void) ;
+    MyApp(void){};
     bool OnInit(void);
 };
 
@@ -31,8 +31,8 @@ class MyFrame: public wxFrame
   public:
     MyCanvas *canvas;
     MyFrame(wxFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size);
+    virtual ~MyFrame();
 
-    bool OnClose(void);
     void OnActivate(bool) {}
     void OnLoadFile(wxCommandEvent& event);
     void OnSaveFile(wxCommandEvent& event);
@@ -46,7 +46,7 @@ class MyCanvas: public wxScrolledWindow
 {
   public:
     MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
-    ~MyCanvas(void) ;
+    ~MyCanvas(void){};
 
     void OnPaint(wxPaintEvent& event);
 DECLARE_EVENT_TABLE()