X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbf1f0e5cffb8c01696eb26e254857a61f017d70..b6b85bdccb56b9eb8d4e5ebce4dc3ff776fc9ce8:/samples/mfc/mfctest.cpp

diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index cbbcd343c2..d50d963470 100644
--- a/samples/mfc/mfctest.cpp
+++ b/samples/mfc/mfctest.cpp
@@ -26,14 +26,29 @@
 // initially as the main frame, and allows wxWindows frames to be
 // created subsequently:
 //
-// (1) Make MyApp::OnInit return NULL, not create a window.
+// (1) Make MyApp::OnInit return FALSE, not creating a window.
 // (2) Restore the MFC code to create a window in InitInstance, and remove
 //     creation of CDummyWindow.
 //
-// IMPORTANT NOTE: to compile this sample, you must first edit
-// wx/src/msw/wx_main.cc, set NOWINMAIN to 1, and remake wxWindows
-// (it only needs to recompile wx_main.cc).
-// This eliminates the duplicate WinMain function which MFC implements.
+// 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.
+//
+// (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.
+//
+// (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.
+//
+// (4) Compiling wxWindows in DLL mode currently includes windows.h, so you must only
+// try linking wxWindows statically.
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
@@ -42,8 +57,10 @@
 #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
 #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.
 #endif
 
 #ifdef new
@@ -60,8 +77,6 @@
 
 #include "mfctest.h"
 
-#include "wx/wx.h"
-
 /////////////////////////////////////////////////////////////////////////////
 
 // theApp:
@@ -78,8 +93,6 @@ class MyApp: public wxApp
     wxFrame *CreateFrame(void);
  };
 
-DECLARE_APP(MyApp)
-
 class MyCanvas: public wxScrolledWindow
 {
   public:
@@ -95,7 +108,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 +120,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 +231,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 +266,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 +273,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 +297,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 +324,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,15 +345,14 @@ void MyCanvas::OnPaint(wxPaintEvent& event)
 void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 {
     wxClientDC dc(this);
-    dc.SetPen(wxBLACK_PEN);
-    long x, y;
-    event.Position(&x, &y);
+    dc.SetPen(* wxBLACK_PEN);
+    wxPoint pos = event.GetPosition();
     if (xpos > -1 && ypos > -1 && event.Dragging())
     {
-        dc.DrawLine(xpos, ypos, x, y);
+        dc.DrawLine(xpos, ypos, pos.x, pos.y);
     }
-    xpos = x;
-    ypos = y;
+    xpos = pos.x;
+    ypos = pos.y;
 }
 
 BEGIN_EVENT_TABLE(MyChild, wxFrame)
@@ -387,12 +389,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()