diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-10 12:35:38 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-10 12:35:38 +0000 |
| commit | 43248e3fd4527bdbc019b5b28bf4fd47264940cb (patch) | |
| tree | 21b7b45676dcb8bb3574db0a01f4b1cf70b9ad20 | |
| parent | 5c5a50a0109ca468107f7a6c09c9154312e76d69 (diff) | |
| download | ATCD-43248e3fd4527bdbc019b5b28bf4fd47264940cb.tar.gz | |
ChangeLogTag: Wed Jan 10 12:30:00 UTC 2007 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/examples/mfc/server.cpp | 12 | ||||
| -rw-r--r-- | TAO/utils/NamingViewer/NamingViewer.cpp | 6 |
3 files changed, 26 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 06619cd51bf..a1f6606f701 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Jan 10 12:30:00 UTC 2007 Simon Massey <sma@prismtech.com> + + * examples/mfc/server.cpp: + * utils/NamingViewer/NamingViewer.cpp: + + From MFC 5.0, Enable3dControls and Enable3dControlsStatic are + obsolete because their functionality is incorporated into + Microsoft's 32-bit operating systems directly. Basically there + is no need to call with VC5.0 and above so I've commented + them out to stop the build issuing deprecated warnings. + Wed Jan 10 09:57:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Compression/server.cpp: diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp index 4dfd59a00d0..f610bc8df5c 100644 --- a/TAO/examples/mfc/server.cpp +++ b/TAO/examples/mfc/server.cpp @@ -167,11 +167,19 @@ BOOL CServerApp::InitInstance() // of your final executable, you should remove from the following // the specific initialization routines you do not need. +/* + From MFC 5.0, Enable3dControls and Enable3dControlsStatic are obsolete + because their functionality is incorporated into Microsoft's 32-bit + operating systems. Basically no need to call with VC5.0 and above. + +#if !defined (_WIN32_WCE) #ifdef _AFXDLL - Enable3dControls(); // Call this when using MFC in a shared DLL + Enable3dControls(); // Call this when using MFC in a shared DLL #else - Enable3dControlsStatic(); // Call this when linking to MFC statically + Enable3dControlsStatic(); // Call this when linking to MFC statically +#endif #endif +*/ // Change the registry key under which our settings are stored. // TODO: You should modify this string to be something appropriate diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp index 2f86a0d3a4a..9296d1ce76a 100644 --- a/TAO/utils/NamingViewer/NamingViewer.cpp +++ b/TAO/utils/NamingViewer/NamingViewer.cpp @@ -47,6 +47,10 @@ BOOL CNamingViewerApp::InitInstance() // If you are not using these features and wish to reduce the size // of your final executable, you should remove from the following // the specific initialization routines you do not need. +/* + From MFC 5.0, Enable3dControls and Enable3dControlsStatic are obsolete + because their functionality is incorporated into Microsoft's 32-bit + operating systems. Basically no need to call with VC5.0 and above. #if !defined (_WIN32_WCE) #ifdef _AFXDLL @@ -55,7 +59,7 @@ BOOL CNamingViewerApp::InitInstance() Enable3dControlsStatic(); // Call this when linking to MFC statically #endif #endif - +*/ // Parse command line arguments so we can initialize ORB with them ACE_ARGV Argv(ACE_TEXT_CHAR_TO_TCHAR(m_lpCmdLine)); |