Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Make Win::HWND a "strong" typedef; this guarantees that code that just assumes Win::HWND is the same type as ::HWND (from <windows.h>) will fail to compile 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3551 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-01-24 00:43:10 +00:00
parent 7c97e5752d
commit d868ec0a50
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/editworld/src/winapi.hpp
View File

@ -32,6 +32,7 @@
#include <windows.h> #include <windows.h>
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#include <boost/strong_typedef.hpp>
#ifdef ShellExecute #ifdef ShellExecute
# undef ShellExecute # undef ShellExecute
@ -93,10 +94,10 @@ namespace Win
*/ */
std::string GetCurrentDirectory(); std::string GetCurrentDirectory();
/** @note: Don't depend on this typedef remaining ::HWND for ever, it might /** @note Don't depend on this typedef remaining ::HWND for ever, it might
* be wrapped in some class later on. * be wrapped in some class later on.
*/ */
typedef ::HWND HWND; BOOST_STRONG_TYPEDEF(::HWND, HWND);
enum show_command enum show_command
{ {
@ -141,7 +142,7 @@ namespace Win
const charT* operation = NULL, const charT* operation = NULL,
const charT* parameters = NULL, const charT* parameters = NULL,
const charT* directory = NULL, const charT* directory = NULL,
HWND hwnd = NULL, HWND hwnd = HWND(NULL),
show_command showCmd = show_command_normal) show_command showCmd = show_command_normal)
{ {
return ShellExecute(hwnd, operation, fileName, parameters, directory, showCmd); return ShellExecute(hwnd, operation, fileName, parameters, directory, showCmd);
@ -154,7 +155,7 @@ namespace Win
const std::basic_string<charT, traits, Allocator>& operation = std::basic_string<charT, traits, Allocator>(), const std::basic_string<charT, traits, Allocator>& operation = std::basic_string<charT, traits, Allocator>(),
const std::basic_string<charT, traits, Allocator>& parameters = std::basic_string<charT, traits, Allocator>(), const std::basic_string<charT, traits, Allocator>& parameters = std::basic_string<charT, traits, Allocator>(),
const std::basic_string<charT, traits, Allocator>& directory = std::basic_string<charT, traits, Allocator>(), const std::basic_string<charT, traits, Allocator>& directory = std::basic_string<charT, traits, Allocator>(),
HWND hwnd = NULL, HWND hwnd = HWND(NULL),
show_command showCmd = show_command_normal) show_command showCmd = show_command_normal)
{ {
const charT * const file = fileName.c_str(); const charT * const file = fileName.c_str();