Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index ab1e42de2ea0a38db2276e3071775182495f446d..31a7ded470045ef977833a993c2798ca42de2ec5 100644 (file)
--- a/samples/mfc/mfctest.cpp
+++ b/samples/mfc/mfctest.cpp
@@ -1,51 +1,68 @@
-// hello.cpp : Defines the class behaviors for the application.
-//           Hello is a simple program which consists of a main window
-//           and an "About" dialog which can be invoked by a menu choice.
-//           It is intended to serve as a starting-point for new
-//           applications.
-//
-// This is a part of the Microsoft Foundation Classes C++ library.
-// Copyright (C) 1992 Microsoft Corporation
-// All rights reserved.
-//
-// This source code is only intended as a supplement to the
-// Microsoft Foundation Classes Reference and Microsoft
-// WinHelp documentation provided with the library.
-// See these sources for detailed information regarding the
-// Microsoft Foundation Classes product.
+/////////////////////////////////////////////////////////////////////////////
+// Name:        mfctest.cpp
+// Purpose:     Sample to demonstrate mixing MFC and wxWidgets code
+// Author:      Julian Smart
+// Id:          $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////

 
 

-// *** MODIFIED BY JULIAN SMART TO DEMONSTRATE CO-EXISTANCE WITH wxWINDOWS ***
-//
-// This sample pops up an initial wxWindows frame, with a menu item
+// This sample pops up an initial wxWidgets frame, with a menu item

 // that allows a new MFC window to be created. Note that CDummyWindow
 // that allows a new MFC window to be created. Note that CDummyWindow

-// is a class that allows a wxWindows window to be seen as a CWnd
+// is a class that allows a wxWidgets window to be seen as a CWnd

 // for the purposes of specifying a valid main window to the
 // MFC initialisation.
 //
 // You can easily modify this code so that an MFC window pops up
 // for the purposes of specifying a valid main window to the
 // MFC initialisation.
 //
 // You can easily modify this code so that an MFC window pops up

-// initially as the main frame, and allows wxWindows frames to be
-// created subsequently:
+// initially as the main frame, and allows wxWidgets frames to be
+// created subsequently.

 //
 //

-// (1) Make MyApp::OnInit return FALSE, not creating a window.
-// (2) Restore the MFC code to create a window in InitInstance, and remove
+// (1) Make MyApp::OnInit not create a main window.
+// (2) Make MFC's InitInstance create a main window, and remove

 //     creation of CDummyWindow.
 //     creation of CDummyWindow.

+//
+// This can be accomplished by setting START_WITH_MFC_WINDOW to 1 below.
+
+#define START_WITH_MFC_WINDOW 0
+

 //
 // IMPORTANT NOTES:
 //
 //
 // IMPORTANT NOTES:
 //

-// (1) You need to set wxUSE_MFC to 1 in include/wx/msw/setup.h, which switches
-// off some debugging features and also removes the windows.h inclusion
-// in wxprec.h (MFC headers don't like this to have been included previously).
-// Then recompile wxWindows and this sample.
+// (1) You may need to set wxUSE_MFC to 1 in include/wx/msw/setup.h but
+//     normally this shouldn't be needed any longer, i.e. it works without
+//     it for me (VZ)

 //
 //

-// (2) 10/3/2000, wxWindows 2.1.14: unfortunately there is an assert when
-// the sample tries to create an MFC window. Any suggestions welcome. It may be
-// a problem with conflicting project settings. Ignoring the assert (several times)
-// allows the sample to continue. In release mode the asserts don't happen.
+// (2) You should link with MFC DLL, not static libraries: or, to use static
+//     run-time libraries, use this command for both building wxWidgets and
+//     the sample:

 //
 //

-// (3) I can't get the sample to link using a static MFC library, only the DLL
-// version. Perhaps someone else is a wizard at working out the required settings
-// in the wxWin library and the sample; then debugging the assert problem may be
-// easier.
+//     nmake -f makefile.vc BUILD=debug SHARED=0 DEBUG_RUNTIME_LIBS=0 RUNTIME_LIBS=static all
+//
+//     Unless the run-time library settings match for wxWidgets and MFC, you
+//     will get link errors for symbols such as __mbctype, __argc, and __argv
+//
+// (3) If you see bogus memory leaks within the MSVC IDE on exit, in this
+//     sample or in your own project, you must be using __WXDEBUG__ +
+//     WXUSINGDLL + _AFXDLL
+//     Unfortunately this confuses the MSVC/MFC leak detector. To do away with
+//     these bogus memory leaks, add this to the list of link objects, make it
+//     first: mfc[version][u]d.lib
+//     -  [version] -> 42 or 70 or 80 etc
+//     -  u if using Unicode
+
+// Disable deprecation warnings from headers included from stdafx.h for VC8+
+#ifndef _CRT_SECURE_NO_WARNINGS
+    #define _CRT_SECURE_NO_WARNINGS
+#endif
+
+// Also define WINVER to avoid warnings about it being undefined from the
+// platform SDK headers (usually this is not necessary because it is done by wx
+// headers but here we include the system ones before them)
+#ifndef WINVER
+    #define WINVER 0x0600
+#endif
+
+#include "stdafx.h"

 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"


@@ -54,21 +71,11 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#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
-#undef new
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"

 #endif
 
 #endif
 

-#include "stdafx.h"
-
-#ifdef DrawText
-#undef DrawText
-#endif
+#include "wx/evtloop.h"

 
 #include "resource.h"
 
 
 #include "resource.h"
 


@@ -81,100 +88,97 @@
 //
 CTheApp theApp;
 
 //
 CTheApp theApp;
 

-// wxWindows elements
+// wxWidgets elements

 
 // Define a new application type
 class MyApp: public wxApp
 
 // Define a new application type
 class MyApp: public wxApp

-{ public:
-    bool OnInit(void);
-    wxFrame *CreateFrame(void);
- };
+{
+public:
+    virtual bool OnInit();
+
+    // we need to override this as the default behaviour only works when we're
+    // running wxWidgets main loop, not MFC one
+    virtual void ExitMainLoop();
+
+    wxFrame *CreateFrame();
+};

 
 class MyCanvas: public wxScrolledWindow
 {
 
 class MyCanvas: public wxScrolledWindow
 {

-  public:
+public:

     MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
     void OnPaint(wxPaintEvent& event);
     void OnMouseEvent(wxMouseEvent& event);
     MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
     void OnPaint(wxPaintEvent& event);
     void OnMouseEvent(wxMouseEvent& event);

-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 class MyChild: public wxFrame
 {
 };
 
 class MyChild: public wxFrame
 {

-  public:
-    MyCanvas *canvas;
+public:

     MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
     MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);

-    ~MyChild(void);
+    virtual ~MyChild();

 
     void OnQuit(wxCommandEvent& event);
     void OnNew(wxCommandEvent& event);
     void OnActivate(wxActivateEvent& event);
 
 
     void OnQuit(wxCommandEvent& event);
     void OnNew(wxCommandEvent& event);
     void OnActivate(wxActivateEvent& event);
 

-DECLARE_EVENT_TABLE()
-};
+    MyCanvas *canvas;

 
 

-// For drawing lines in a canvas
-long xpos = -1;
-long ypos = -1;
+    DECLARE_EVENT_TABLE()
+};

 
 // ID for the menu quit command
 #define HELLO_QUIT 1
 #define HELLO_NEW  2
 
 DECLARE_APP(MyApp)
 
 // ID for the menu quit command
 #define HELLO_QUIT 1
 #define HELLO_NEW  2
 
 DECLARE_APP(MyApp)

-IMPLEMENT_APP(MyApp)

 
 

-/////////////////////////////////////////////////////////////////////////////
+// notice use of IMPLEMENT_APP_NO_MAIN() instead of the usual IMPLEMENT_APP!
+IMPLEMENT_APP_NO_MAIN(MyApp)
+
+#ifdef _UNICODE
+// In Unicode build MFC normally requires to manually change the entry point to
+// wWinMainCRTStartup() but to avoid having to modify the project options to do
+// it we provide an adapter for it.
+extern "C" int wWinMainCRTStartup();
+
+int WINAPI WinMain(HINSTANCE, HINSTANCE, char *, int)
+{
+    wWinMainCRTStartup();
+}
+#endif // _UNICODE

 
 

-// CMainWindow constructor:
-// Create the window with the appropriate style, size, menu, etc.
-//

 CMainWindow::CMainWindow()
 {
 CMainWindow::CMainWindow()
 {

-       LoadAccelTable( "MainAccelTable" );
-       Create( NULL, "Hello Foundation Application",
-               WS_OVERLAPPEDWINDOW, rectDefault, NULL, "MainMenu" );
+    LoadAccelTable( wxT("MainAccelTable") );
+    Create( NULL, wxT("Hello Foundation Application"),
+        WS_OVERLAPPEDWINDOW, rectDefault, NULL, wxT("MainMenu") );

 }
 
 }
 

-// OnPaint:
-// This routine draws the string "Hello, Windows!" in the center of the
-// client area.  It is called whenever Windows sends a WM_PAINT message.
-// Note that creating a CPaintDC automatically does a BeginPaint and
-// an EndPaint call is done when it is destroyed at the end of this
-// function.  CPaintDC's constructor needs the window (this).
-//

 void CMainWindow::OnPaint()
 {
 void CMainWindow::OnPaint()
 {

-       CString s = "Hello, Windows!";
-       CPaintDC dc( this );
-       CRect rect;
-
-       GetClientRect( rect );
-       dc.SetTextAlign( TA_BASELINE | TA_CENTER );
-       dc.SetTextColor( ::GetSysColor( COLOR_WINDOWTEXT ) );
-       dc.SetBkMode(TRANSPARENT);
-       dc.TextOut( ( rect.right / 2 ), ( rect.bottom / 2 ),
-                               s, s.GetLength() );
+    CString s = wxT("Hello, Windows!");
+    CPaintDC dc( this );
+    CRect rect;
+
+    GetClientRect( rect );
+    dc.SetTextAlign( TA_BASELINE | TA_CENTER );
+    dc.SetTextColor( ::GetSysColor( COLOR_WINDOWTEXT ) );
+    dc.SetBkMode(TRANSPARENT);
+    dc.TextOut( ( rect.right / 2 ), ( rect.bottom / 2 ),
+        s, s.GetLength() );

 }
 
 }
 

-// OnAbout:
-// This member function is called when a WM_COMMAND message with an
-// IDM_ABOUT code is received by the CMainWindow class object.  The
-// message map below is responsible for this routing.
-//
-// We create a ClDialog object using the "AboutBox" resource (see
-// hello.rc), and invoke it.
-//

 void CMainWindow::OnAbout()
 {
 void CMainWindow::OnAbout()
 {

-       CDialog about( "AboutBox", this );
-       about.DoModal();
+    CDialog about( wxT("AboutBox"), this );
+    about.DoModal();

 }
 
 void CMainWindow::OnTest()
 {
 }
 
 void CMainWindow::OnTest()
 {

-  wxMessageBox("This is a wxWindows message box.\nWe're about to create a new wxWindows frame.", "wxWindows", wxOK);
-  wxGetApp().CreateFrame();
+    wxMessageBox(wxT("This is a wxWidgets message box.\nWe're about to create a new wxWidgets frame."), wxT("wxWidgets"), wxOK);
+    wxGetApp().CreateFrame();

 }
 
 // CMainWindow message map:
 }
 
 // CMainWindow message map:


@@ -187,122 +191,134 @@ void CMainWindow::OnTest()
 // receive no arguments and are void of return type, e.g., "void OnAbout()".
 //
 BEGIN_MESSAGE_MAP( CMainWindow, CFrameWnd )
 // receive no arguments and are void of return type, e.g., "void OnAbout()".
 //
 BEGIN_MESSAGE_MAP( CMainWindow, CFrameWnd )

-       //{{AFX_MSG_MAP( CMainWindow )
-       ON_WM_PAINT()
-       ON_COMMAND( IDM_ABOUT, OnAbout )
-       ON_COMMAND( IDM_TEST, OnTest )
-       //}}AFX_MSG_MAP
+//{{AFX_MSG_MAP( CMainWindow )
+ON_WM_PAINT()
+ON_COMMAND( IDM_ABOUT, OnAbout )
+ON_COMMAND( IDM_TEST, OnTest )
+//}}AFX_MSG_MAP

 END_MESSAGE_MAP()
 
 END_MESSAGE_MAP()
 

-/////////////////////////////////////////////////////////////////////////////
-// CTheApp
-
-// InitInstance:
-// When any CTheApp object is created, this member function is automatically
-// called.  Any data may be set up at this point.
-//
-// Also, the main window of the application should be created and shown here.
-// Return TRUE if the initialization is successful.
-//

 BOOL CTheApp::InitInstance()
 {
 BOOL CTheApp::InitInstance()
 {

-       TRACE( "HELLO WORLD\n" );
-
-       SetDialogBkColor();     // hook gray dialogs (was default in MFC V1)
-
-    wxEntry((WXHINSTANCE) m_hInstance, (WXHINSTANCE) m_hPrevInstance, m_lpCmdLine, m_nCmdShow, FALSE);
+    if ( !CWinApp::InitInstance() )
+        return FALSE;

 
 

-/*
-       m_pMainWnd = new CMainWindow();
-       m_pMainWnd->ShowWindow( m_nCmdShow );
-       m_pMainWnd->UpdateWindow();
-*/
+    // TODO: cmd line parsing
+    WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
+    wxSetInstance(m_hInstance);
+    wxApp::m_nCmdShow = m_nCmdShow;
+    int argc = 0;
+    wxChar **argv = NULL;
+    wxEntryStart(argc, argv);
+    if ( !wxTheApp || !wxTheApp->CallOnInit() )
+        return FALSE;

 
 

+#if START_WITH_MFC_WINDOW
+    // Demonstrate creation of an initial MFC main window.
+    m_pMainWnd = new CMainWindow();
+    m_pMainWnd->ShowWindow( m_nCmdShow );
+    m_pMainWnd->UpdateWindow();
+#else
+    // Demonstrate creation of an initial wxWidgets main window.
+    // Wrap wxWidgets window in a dummy MFC window and
+    // make the main window.

     if (wxTheApp && wxTheApp->GetTopWindow())
     {
         m_pMainWnd = new CDummyWindow((HWND) wxTheApp->GetTopWindow()->GetHWND());
     }
     if (wxTheApp && wxTheApp->GetTopWindow())
     {
         m_pMainWnd = new CDummyWindow((HWND) wxTheApp->GetTopWindow()->GetHWND());
     }

+#endif

 
 

-       return TRUE;
+    return TRUE;

 }
 
 int CTheApp::ExitInstance()
 {
 }
 
 int CTheApp::ExitInstance()
 {

-  // OnExit isn't called by CleanUp so must be called explicitly.
-  wxTheApp->OnExit();
-  wxApp::CleanUp();
+#if !START_WITH_MFC_WINDOW
+    delete m_pMainWnd;
+#endif

 
 

-  return CWinApp::ExitInstance();
-}
+    if ( wxTheApp )
+        wxTheApp->OnExit();
+    wxEntryCleanup();

 
 

-// Override this to provide wxWindows message loop
-// compatibility
+    return CWinApp::ExitInstance();
+}

 
 

+// Override this to provide wxWidgets message loop compatibility

 BOOL CTheApp::PreTranslateMessage(MSG *msg)
 {
 BOOL CTheApp::PreTranslateMessage(MSG *msg)
 {

-  if (wxTheApp && wxTheApp->ProcessMessage((WXMSG*) msg))
-    return TRUE;
-  else
+    wxEventLoop * const
+        evtLoop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());
+    if ( evtLoop && evtLoop->PreProcessMessage(msg) )
+        return TRUE;
+

     return CWinApp::PreTranslateMessage(msg);
 }
 
     return CWinApp::PreTranslateMessage(msg);
 }
 

-BOOL CTheApp::OnIdle(LONG lCount)
+BOOL CTheApp::OnIdle(LONG WXUNUSED(lCount))

 {
 {

-    if (wxTheApp)
-        return wxTheApp->ProcessIdle();
-    else
-        return FALSE;
+    return wxTheApp && wxTheApp->ProcessIdle();

 }
 
 /*********************************************************************
 }
 
 /*********************************************************************

- * wxWindows elements
- ********************************************************************/
- 
-bool MyApp::OnInit(void)
+* wxWidgets elements
+********************************************************************/
+
+bool MyApp::OnInit()

 {
 {

-  // Don't exit app when the top level frame is deleted
-//  SetExitOnFrameDelete(FALSE);
-  
-  wxFrame* frame = CreateFrame();
-  return TRUE;
+    if ( !wxApp::OnInit() )
+        return false;
+
+#if !START_WITH_MFC_WINDOW
+    // as we're not inside wxWidgets main loop, the default logic doesn't work
+    // in our case and we need to do this explicitly
+    SetExitOnFrameDelete(true);
+
+    (void) CreateFrame();
+#endif
+
+    return true;

 }
 
 }
 

-wxFrame *MyApp::CreateFrame(void)
+void MyApp::ExitMainLoop()

 {
 {

-      MyChild *subframe = new MyChild(NULL, "Canvas Frame", wxPoint(10, 10), wxSize(300, 300),
-                             wxDEFAULT_FRAME_STYLE);
+    // instead of existing wxWidgets main loop, terminate the MFC one
+    ::PostQuitMessage(0);
+}

 
 

-      subframe->SetTitle("wxWindows canvas frame");
+wxFrame *MyApp::CreateFrame()
+{
+    MyChild *subframe = new MyChild(NULL, wxT("Canvas Frame"), wxPoint(10, 10), wxSize(300, 300),
+        wxDEFAULT_FRAME_STYLE);

 
 

-      // Give it a status line
-      subframe->CreateStatusBar();
+    subframe->SetTitle(wxT("wxWidgets canvas frame"));

 
 

-      // Make a menubar
-      wxMenu *file_menu = new wxMenu;
+    // Give it a status line
+    subframe->CreateStatusBar();

 
 

-      file_menu->Append(HELLO_NEW, "&New MFC Window");
-      file_menu->Append(HELLO_QUIT, "&Close");
+    // Make a menubar
+    wxMenu *file_menu = new wxMenu;

 
 

-      wxMenuBar *menu_bar = new wxMenuBar;
+    file_menu->Append(HELLO_NEW, wxT("&New MFC Window"));
+    file_menu->Append(HELLO_QUIT, wxT("&Close"));

 
 

-      menu_bar->Append(file_menu, "&File");
+    wxMenuBar *menu_bar = new wxMenuBar;

 
 

-      // Associate the menu bar with the frame
-      subframe->SetMenuBar(menu_bar);
+    menu_bar->Append(file_menu, wxT("&File"));

 
 

-      int width, height;
-      subframe->GetClientSize(&width, &height);
+    // Associate the menu bar with the frame
+    subframe->SetMenuBar(menu_bar);

 
 

-      MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
-      canvas->SetCursor(wxCursor(wxCURSOR_PENCIL));
-      subframe->canvas = canvas;
+    int width, height;
+    subframe->GetClientSize(&width, &height);

 
 

-      // Give it scrollbars
-//      canvas->SetScrollbars(20, 20, 50, 50, 4, 4);
+    MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
+    canvas->SetCursor(wxCursor(wxCURSOR_PENCIL));
+    subframe->canvas = canvas;
+    subframe->Show(true);

 
 

-      subframe->Show(TRUE);
-      // Return the main frame window
-      return subframe;
+    // Return the main frame window
+    return subframe;

 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)


@@ -311,13 +327,13 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas

-MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
- wxScrolledWindow(parent, -1, pos, size)
+MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
+        : wxScrolledWindow(parent, -1, pos, size)

 {
 }
 
 // Define the repainting behaviour
 {
 }
 
 // Define the repainting behaviour

-void MyCanvas::OnPaint(wxPaintEvent& event)
+void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))

 {
     wxPaintDC dc(this);
 
 {
     wxPaintDC dc(this);
 


@@ -332,24 +348,27 @@ void MyCanvas::OnPaint(wxPaintEvent& event)
     dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
 
     dc.DrawEllipse(250, 250, 100, 50);
     dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
 
     dc.DrawEllipse(250, 250, 100, 50);

-    dc.DrawSpline(50, 200, 50, 100, 200, 10);

     dc.DrawLine(50, 230, 200, 230);
     dc.DrawLine(50, 230, 200, 230);

-    dc.DrawText("This is a test string", 50, 230);
+    dc.DrawText(wxT("This is a test string"), 50, 230);

 }
 
 // This implements a tiny doodling program! Drag the mouse using
 // the left button.
 void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 {
 }
 
 // This implements a tiny doodling program! Drag the mouse using
 // the left button.
 void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 {

+    static long s_xpos = -1;
+    static long s_ypos = -1;
+

     wxClientDC dc(this);
     dc.SetPen(* wxBLACK_PEN);
     wxPoint pos = event.GetPosition();
     wxClientDC dc(this);
     dc.SetPen(* wxBLACK_PEN);
     wxPoint pos = event.GetPosition();

-    if (xpos > -1 && ypos > -1 && event.Dragging())
+    if (s_xpos > -1 && s_ypos > -1 && event.Dragging())

     {
     {

-        dc.DrawLine(xpos, ypos, pos.x, pos.y);
+        dc.DrawLine(s_xpos, s_ypos, pos.x, pos.y);

     }
     }

-    xpos = pos.x;
-    ypos = pos.y;
+
+    s_xpos = pos.x;
+    s_ypos = pos.y;

 }
 
 BEGIN_EVENT_TABLE(MyChild, wxFrame)
 }
 
 BEGIN_EVENT_TABLE(MyChild, wxFrame)


@@ -358,44 +377,46 @@ BEGIN_EVENT_TABLE(MyChild, wxFrame)
     EVT_ACTIVATE(MyChild::OnActivate)
 END_EVENT_TABLE()
 
     EVT_ACTIVATE(MyChild::OnActivate)
 END_EVENT_TABLE()
 

-MyChild::MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style):
-  wxFrame(frame, -1, title, pos, size, style)
+MyChild::MyChild(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, const long style)
+       : wxFrame(frame, -1, title, pos, size, style)

 {
 {

-  canvas = NULL;
+    canvas = NULL;

 }
 
 }
 

-MyChild::~MyChild(void)
+MyChild::~MyChild()

 {
 {

+    if ( IsLastBeforeExit() )
+        PostQuitMessage(0);

 }
 
 }
 

-void MyChild::OnQuit(wxCommandEvent& event)
+void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))

 {
 {

-    Close(TRUE);
+    Close(true);

 }
 
 }
 

-void MyChild::OnNew(wxCommandEvent& event)
+void MyChild::OnNew(wxCommandEvent& WXUNUSED(event))

 {
     CMainWindow *mainWin = new CMainWindow();
     mainWin->ShowWindow( TRUE );
     mainWin->UpdateWindow();
 }
 {
     CMainWindow *mainWin = new CMainWindow();
     mainWin->ShowWindow( TRUE );
     mainWin->UpdateWindow();
 }

- 
+

 void MyChild::OnActivate(wxActivateEvent& event)
 {
 void MyChild::OnActivate(wxActivateEvent& event)
 {

-  if (event.GetActive() && canvas)
-    canvas->SetFocus();
+    if (event.GetActive() && canvas)
+        canvas->SetFocus();

 }
 
 // Dummy MFC window for specifying a valid main window to MFC, using
 }
 
 // Dummy MFC window for specifying a valid main window to MFC, using

-// a wxWindows HWND.
-CDummyWindow::CDummyWindow(HWND hWnd):CWnd()
+// a wxWidgets HWND.
+CDummyWindow::CDummyWindow(HWND hWnd)

 {
 {

-  Attach(hWnd);
+    Attach(hWnd);

 }
 
 // Don't let the CWnd destructor delete the HWND
 }
 
 // Don't let the CWnd destructor delete the HWND

-CDummyWindow::~CDummyWindow(void)
+CDummyWindow::~CDummyWindow()

 {
 {

-  Detach();
+    Detach();

 }
 
 }