Avoid CRT deprecation warnings for MSVC build using makefiles too.

[wxWidgets.git] / demos / poem / wxpoem.h

diff --git a/demos/poem/wxpoem.h b/demos/poem/wxpoem.h
index 0b63613546bb5e7640e57dc470e82d69f86ba401..c8975779c2957828bced312519daa49e48730430 100644 (file)
--- a/demos/poem/wxpoem.h
+++ b/demos/poem/wxpoem.h
@@ -14,9 +14,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "wxpoem.h"
-#endif
+#ifndef _WXPOEM_H_
+#define _WXPOEM_H_
+
 
 // Define a new application
 class MyApp: public wxApp
@@ -33,7 +33,7 @@ class MyCanvas: public wxWindow
 {
 public:
     MyCanvas(wxFrame *frame);
-    ~MyCanvas();
+    virtual ~MyCanvas();
 
     void OnPaint(wxPaintEvent& event);
     void OnMouseEvent(wxMouseEvent& event);
@@ -50,7 +50,9 @@ class MainWindow: public wxFrame
 {
 public:
     MyCanvas *canvas;
-    MainWindow(wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style);
+    MainWindow(wxFrame *frame, wxWindowID id, const wxString& title,
+               const wxPoint& pos, const wxSize& size, long style);
+    virtual ~MainWindow();
 
     void OnCloseWindow(wxCloseEvent& event);
     void OnChar(wxKeyEvent& event);
@@ -90,6 +92,9 @@ private:
     wxFont *m_boldFont;
     wxFont *m_italicFont;
 
+    // Icons
+    wxIcon *m_corners[4];
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -107,3 +112,5 @@ enum
     POEM_SEARCH        = wxID_FIND,
     POEM_MINIMIZE      = wxID_ICONIZE_FRAME
 };
+
+#endif      // _WXPOEM_H_