X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/224311348756853f888aca53e772072c0ce16b73..d5cc191c9cd48a915ce0dfc6e49511b2fddb6746:/samples/mfc/mfctest.cpp

diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index 1a396e1204..31a7ded470 100644
--- a/samples/mfc/mfctest.cpp
+++ b/samples/mfc/mfctest.cpp
@@ -1,29 +1,20 @@
-// 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
-// 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
-// initially as the main frame, and allows wxWindows frames to be
+// initially as the main frame, and allows wxWidgets frames to be
 // created subsequently.
 //
 // (1) Make MyApp::OnInit not create a main window.
@@ -37,19 +28,41 @@
 //
 // 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).
-// Set to 'Use MFC in a shared DLL' or add _AFXDLL to preprocessor settings.
-// 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) I can't get the sample to link and run 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.
+// (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) Compiling wxWindows in DLL mode currently includes windows.h, so you must only
-// try linking wxWindows statically.
+//     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"
@@ -58,21 +71,11 @@
 #pragma hdrstop
 #endif
 
-#include "wx/wx.h"
-
-#if defined(_WINDOWS_) || !wxUSE_MFC
-#error Sorry, you need to edit include/wx/msw/setup.h, set wxUSE_MFC to 1, and recompile.
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
 #endif
 
-#ifdef new
-#undef new
-#endif
-
-#include "stdafx.h"
-
-#ifdef DrawText
-#undef DrawText
-#endif
+#include "wx/evtloop.h"
 
 #include "resource.h"
 
@@ -85,13 +88,19 @@
 //
 CTheApp theApp;
 
-// wxWindows elements
+// wxWidgets elements
 
 // 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
@@ -106,53 +115,52 @@ public:
 class MyChild: public wxFrame
 {
 public:
-    MyCanvas *canvas;
     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);
-    
+
+    MyCanvas *canvas;
+
     DECLARE_EVENT_TABLE()
 };
 
-// For drawing lines in a canvas
-long xpos = -1;
-long ypos = -1;
-
 // 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()
 {
-    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()
 {
-    CString s = "Hello, Windows!";
+    CString s = wxT("Hello, Windows!");
     CPaintDC dc( this );
     CRect rect;
-    
+
     GetClientRect( rect );
     dc.SetTextAlign( TA_BASELINE | TA_CENTER );
     dc.SetTextColor( ::GetSysColor( COLOR_WINDOWTEXT ) );
@@ -161,23 +169,15 @@ void CMainWindow::OnPaint()
         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()
 {
-    CDialog about( "AboutBox", this );
+    CDialog about( wxT("AboutBox"), this );
     about.DoModal();
 }
 
 void CMainWindow::OnTest()
 {
-    wxMessageBox("This is a wxWindows message box.\nWe're about to create a new wxWindows frame.", "wxWindows", wxOK);
+    wxMessageBox(wxT("This is a wxWidgets message box.\nWe're about to create a new wxWidgets frame."), wxT("wxWidgets"), wxOK);
     wxGetApp().CreateFrame();
 }
 
@@ -198,115 +198,124 @@ ON_COMMAND( IDM_TEST, OnTest )
 //}}AFX_MSG_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()
 {
-    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;
+
+    // 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 wxWindows main window.
-    // Wrap wxWindows window in a dummy MFC window and
+#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());
     }
 #endif
-    
+
     return TRUE;
 }
 
 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
+
+    if ( wxTheApp )
+        wxTheApp->OnExit();
+    wxEntryCleanup();
+
     return CWinApp::ExitInstance();
 }
 
-// Override this to provide wxWindows message loop
-// compatibility
-
+// Override this to provide wxWidgets message loop compatibility
 BOOL CTheApp::PreTranslateMessage(MSG *msg)
 {
-    if (wxTheApp && wxTheApp->ProcessMessage((WXMSG*) msg))
+    wxEventLoop * const
+        evtLoop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());
+    if ( evtLoop && evtLoop->PreProcessMessage(msg) )
         return TRUE;
-    else
-        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
+* wxWidgets elements
 ********************************************************************/
 
-bool MyApp::OnInit(void)
+bool MyApp::OnInit()
 {
+    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);
 
-    // Exit app when the top level frame is deleted
-    SetExitOnFrameDelete(TRUE);
-    
     (void) CreateFrame();
 #endif
 
-    return TRUE;
+    return true;
 }
 
-wxFrame *MyApp::CreateFrame(void)
+void MyApp::ExitMainLoop()
 {
-    MyChild *subframe = new MyChild(NULL, "Canvas Frame", wxPoint(10, 10), wxSize(300, 300),
+    // instead of existing wxWidgets main loop, terminate the MFC one
+    ::PostQuitMessage(0);
+}
+
+wxFrame *MyApp::CreateFrame()
+{
+    MyChild *subframe = new MyChild(NULL, wxT("Canvas Frame"), wxPoint(10, 10), wxSize(300, 300),
         wxDEFAULT_FRAME_STYLE);
-    
-    subframe->SetTitle("wxWindows canvas frame");
-    
+
+    subframe->SetTitle(wxT("wxWidgets canvas frame"));
+
     // Give it a status line
     subframe->CreateStatusBar();
-    
+
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
-    
-    file_menu->Append(HELLO_NEW, "&New MFC Window");
-    file_menu->Append(HELLO_QUIT, "&Close");
-    
+
+    file_menu->Append(HELLO_NEW, wxT("&New MFC Window"));
+    file_menu->Append(HELLO_QUIT, wxT("&Close"));
+
     wxMenuBar *menu_bar = new wxMenuBar;
-    
-    menu_bar->Append(file_menu, "&File");
-    
+
+    menu_bar->Append(file_menu, wxT("&File"));
+
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
-    
+
     int width, height;
     subframe->GetClientSize(&width, &height);
-    
+
     MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));
     canvas->SetCursor(wxCursor(wxCURSOR_PENCIL));
-    subframe->canvas = canvas;    
-    subframe->Show(TRUE);
+    subframe->canvas = canvas;
+    subframe->Show(true);
 
     // Return the main frame window
     return subframe;
@@ -318,45 +327,48 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 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
-void MyCanvas::OnPaint(wxPaintEvent& event)
+void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
-    
+
     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.DrawRectangle(100, 100, 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.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)
 {
+    static long s_xpos = -1;
+    static long s_ypos = -1;
+
     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)
@@ -365,22 +377,24 @@ BEGIN_EVENT_TABLE(MyChild, wxFrame)
     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;
 }
 
-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 );
@@ -394,14 +408,14 @@ void MyChild::OnActivate(wxActivateEvent& event)
 }
 
 // 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);
 }
 
 // Don't let the CWnd destructor delete the HWND
-CDummyWindow::~CDummyWindow(void)
+CDummyWindow::~CDummyWindow()
 {
     Detach();
 }