moved Destroy() to the beginning

[wxWidgets.git] / samples / mfc / mfctest.cpp

diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index cbbcd343c23d7968f094c5128c8fde71d618c70b..91ed30dbdcc24af6c5dc5c12fbd0f534ea18f171 100644 (file)
--- a/samples/mfc/mfctest.cpp
+++ b/samples/mfc/mfctest.cpp
@@ -42,8 +42,10 @@
 #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
 #include "wx/wx.h"
+
+#ifdef _WINDOWS_
+#error Sorry, you need to edit include/wx/wxprec.h, comment out the windows.h inclusion, and recompile.
 #endif
 
 #ifdef new
@@ -60,8 +62,6 @@
 
 #include "mfctest.h"
 
-#include "wx/wx.h"
-
 /////////////////////////////////////////////////////////////////////////////
 
 // theApp:
@@ -78,8 +78,6 @@ class MyApp: public wxApp
     wxFrame *CreateFrame(void);
  };
 
-DECLARE_APP(MyApp)
-
 class MyCanvas: public wxScrolledWindow
 {
   public:
@@ -95,7 +93,6 @@ class MyChild: public wxFrame
     MyCanvas *canvas;
     MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
     ~MyChild(void);
-    Bool OnClose(void);
 
     void OnQuit(wxCommandEvent& event);
     void OnNew(wxCommandEvent& event);
@@ -108,10 +105,6 @@ DECLARE_EVENT_TABLE()
 long xpos = -1;
 long ypos = -1;
 
-// Initialise this in OnInit, not statically
-wxPen *red_pen;
-wxFont *small_font;
-
 // ID for the menu quit command
 #define HELLO_QUIT 1
 #define HELLO_NEW  2
@@ -223,6 +216,8 @@ BOOL CTheApp::InitInstance()
 
 int CTheApp::ExitInstance()
 {
+  // OnExit isn't called by CleanUp so must be called explicitly.
+  wxTheApp->OnExit();
   wxApp::CleanUp();
 
   return CWinApp::ExitInstance();
@@ -256,12 +251,6 @@ bool MyApp::OnInit(void)
   // Don't exit app when the top level frame is deleted
 //  SetExitOnFrameDelete(FALSE);
   
-  // Create a red pen
-  red_pen = new wxPen("RED", 3, wxSOLID);
-
-  // Create a small font
-  small_font = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL);
-
   wxFrame* frame = CreateFrame();
   return TRUE;
 }
@@ -269,7 +258,7 @@ bool MyApp::OnInit(void)
 wxFrame *MyApp::CreateFrame(void)
 {
       MyChild *subframe = new MyChild(NULL, "Canvas Frame", wxPoint(10, 10), wxSize(300, 300),
-                             wxDEFAULT_FRAME);
+                             wxDEFAULT_FRAME_STYLE);
 
       subframe->SetTitle("wxWindows canvas frame");
 
@@ -293,8 +282,7 @@ wxFrame *MyApp::CreateFrame(void)
       subframe->GetClientSize(&width, &height);
 
       MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
-      wxCursor *cursor = new wxCursor(wxCURSOR_PENCIL);
-      canvas->SetCursor(cursor);
+      canvas->SetCursor(wxCursor(wxCURSOR_PENCIL));
       subframe->canvas = canvas;
 
       // Give it scrollbars
@@ -321,13 +309,13 @@ void MyCanvas::OnPaint(wxPaintEvent& event)
 {
     wxPaintDC dc(this);
 
-    dc.SetFont(small_font);
-    dc.SetPen(wxGREEN_PEN);
+    dc.SetFont(* wxSWISS_FONT);
+    dc.SetPen(* wxGREEN_PEN);
     dc.DrawLine(0, 0, 200, 200);
     dc.DrawLine(200, 0, 0, 200);
 
-    dc.SetBrush(wxCYAN_BRUSH);
-    dc.SetPen(wxRED_PEN);
+    dc.SetBrush(* wxCYAN_BRUSH);
+    dc.SetPen(* wxRED_PEN);
     dc.DrawRectangle(100, 100, 100, 50);
     dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
 
@@ -342,7 +330,7 @@ void MyCanvas::OnPaint(wxPaintEvent& event)
 void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 {
     wxClientDC dc(this);
-    dc.SetPen(wxBLACK_PEN);
+    dc.SetPen(* wxBLACK_PEN);
     long x, y;
     event.Position(&x, &y);
     if (xpos > -1 && ypos > -1 && event.Dragging())
@@ -387,12 +375,6 @@ void MyChild::OnActivate(wxActivateEvent& event)
     canvas->SetFocus();
 }
 
-Bool MyChild::OnClose(void)
-{
-  return TRUE;
-}
-
-
 // Dummy MFC window for specifying a valid main window to MFC, using
 // a wxWindows HWND.
 CDummyWindow::CDummyWindow(HWND hWnd):CWnd()