Don't use GetThreadId() in wxMSW code.

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

diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index a4102648a94a6febd46df3f220b228f6d33fb0bc..31a7ded470045ef977833a993c2798ca42de2ec5 100644 (file)
--- a/samples/mfc/mfctest.cpp
+++ b/samples/mfc/mfctest.cpp
@@ -39,7 +39,7 @@
 //     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 
+//     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__ +
@@ -49,10 +49,18 @@
 //     first: mfc[version][u]d.lib
 //     -  [version] -> 42 or 70 or 80 etc
 //     -  u if using Unicode
-//
-// (4) Unicode builds may produce the linker error "unresolved external symbol _WinMain@16".
-//     MFC requires you to manually add the Unicode entry point to the linker settings,
-//     Entry point symbol -> wWinMainCRTStartup
+
+// 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"
 
@@ -128,16 +136,28 @@ DECLARE_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::CMainWindow()
 {
-    LoadAccelTable( _T("MainAccelTable") );
-    Create( NULL, _T("Hello Foundation Application"),
-        WS_OVERLAPPEDWINDOW, rectDefault, NULL, _T("MainMenu") );
+    LoadAccelTable( wxT("MainAccelTable") );
+    Create( NULL, wxT("Hello Foundation Application"),
+        WS_OVERLAPPEDWINDOW, rectDefault, NULL, wxT("MainMenu") );
 }
 
 void CMainWindow::OnPaint()
 {
-    CString s = _T("Hello, Windows!");
+    CString s = wxT("Hello, Windows!");
     CPaintDC dc( this );
     CRect rect;
 
@@ -151,13 +171,13 @@ void CMainWindow::OnPaint()
 
 void CMainWindow::OnAbout()
 {
-    CDialog about( _T("AboutBox"), this );
+    CDialog about( wxT("AboutBox"), this );
     about.DoModal();
 }
 
 void CMainWindow::OnTest()
 {
-    wxMessageBox(_T("This is a wxWidgets message box.\nWe're about to create a new wxWidgets frame."), _T("wxWidgets"), wxOK);
+    wxMessageBox(wxT("This is a wxWidgets message box.\nWe're about to create a new wxWidgets frame."), wxT("wxWidgets"), wxOK);
     wxGetApp().CreateFrame();
 }
 
@@ -268,10 +288,10 @@ void MyApp::ExitMainLoop()
 
 wxFrame *MyApp::CreateFrame()
 {
-    MyChild *subframe = new MyChild(NULL, _T("Canvas Frame"), wxPoint(10, 10), wxSize(300, 300),
+    MyChild *subframe = new MyChild(NULL, wxT("Canvas Frame"), wxPoint(10, 10), wxSize(300, 300),
         wxDEFAULT_FRAME_STYLE);
 
-    subframe->SetTitle(_T("wxWidgets canvas frame"));
+    subframe->SetTitle(wxT("wxWidgets canvas frame"));
 
     // Give it a status line
     subframe->CreateStatusBar();
@@ -279,12 +299,12 @@ wxFrame *MyApp::CreateFrame()
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
-    file_menu->Append(HELLO_NEW, _T("&New MFC Window"));
-    file_menu->Append(HELLO_QUIT, _T("&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, _T("&File"));
+    menu_bar->Append(file_menu, wxT("&File"));
 
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
@@ -329,7 +349,7 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     dc.DrawEllipse(250, 250, 100, 50);
     dc.DrawLine(50, 230, 200, 230);
-    dc.DrawText(_T("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