Add support for wxAuiNotebook to XRC.

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

diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp
index 18b91e36473535fddec7694a3bea2739feedb278..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
 //     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__ +
 //
 // (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__ +


@@ -50,6 +50,18 @@
 //     -  [version] -> 42 or 70 or 80 etc
 //     -  u if using Unicode
 
 //     -  [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 "stdafx.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -124,16 +136,28 @@ DECLARE_APP(MyApp)
 // notice use of IMPLEMENT_APP_NO_MAIN() instead of the usual IMPLEMENT_APP!
 IMPLEMENT_APP_NO_MAIN(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()
 {
 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()
 {
 }
 
 void CMainWindow::OnPaint()
 {

-    CString s = _T("Hello, Windows!");
+    CString s = wxT("Hello, Windows!");

     CPaintDC dc( this );
     CRect rect;
 
     CPaintDC dc( this );
     CRect rect;
 


@@ -147,13 +171,13 @@ void CMainWindow::OnPaint()
 
 void CMainWindow::OnAbout()
 {
 
 void CMainWindow::OnAbout()
 {

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

     about.DoModal();
 }
 
 void CMainWindow::OnTest()
 {
     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();
 }
 
     wxGetApp().CreateFrame();
 }
 


@@ -224,7 +248,7 @@ int CTheApp::ExitInstance()
 BOOL CTheApp::PreTranslateMessage(MSG *msg)
 {
     wxEventLoop * const
 BOOL CTheApp::PreTranslateMessage(MSG *msg)
 {
     wxEventLoop * const

-        evtLoop = wx_static_cast(wxEventLoop *, wxEventLoop::GetActive());
+        evtLoop = static_cast<wxEventLoop *>(wxEventLoop::GetActive());

     if ( evtLoop && evtLoop->PreProcessMessage(msg) )
         return TRUE;
 
     if ( evtLoop && evtLoop->PreProcessMessage(msg) )
         return TRUE;
 


@@ -264,10 +288,10 @@ void MyApp::ExitMainLoop()
 
 wxFrame *MyApp::CreateFrame()
 {
 
 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);
 
         wxDEFAULT_FRAME_STYLE);
 

-    subframe->SetTitle(_T("wxWidgets canvas frame"));
+    subframe->SetTitle(wxT("wxWidgets canvas frame"));

 
     // Give it a status line
     subframe->CreateStatusBar();
 
     // Give it a status line
     subframe->CreateStatusBar();


@@ -275,12 +299,12 @@ wxFrame *MyApp::CreateFrame()
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
     // 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;
 
 
     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);
 
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);


@@ -325,7 +349,7 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     dc.DrawEllipse(250, 250, 100, 50);
     dc.DrawLine(50, 230, 200, 230);
 
     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
 }
 
 // This implements a tiny doodling program! Drag the mouse using