projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include jconfig.vc under OS/2 too
[wxWidgets.git]
/
src
/
msw
/
ole
/
uuid.cpp
diff --git
a/src/msw/ole/uuid.cpp
b/src/msw/ole/uuid.cpp
index 87bdd0cc0892032d19c101ee6e7ee7e63d0d17e8..0b1020d84915dce7dda313f782864eae297d38b5 100644
(file)
--- a/
src/msw/ole/uuid.cpp
+++ b/
src/msw/ole/uuid.cpp
@@
-1,8
+1,8
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: ole/uuid.cpp
+// Name:
src/msw/
ole/uuid.cpp
// Purpose: implements Uuid class, see uuid.h for details
// Author: Vadim Zeitlin
// Purpose: implements Uuid class, see uuid.h for details
// Author: Vadim Zeitlin
-// Modified by:
+// Modified by:
// Created: 12.09.96
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Created: 12.09.96
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@
-13,10
+13,6
@@
// Declarations
// ============================================================================
// Declarations
// ============================================================================
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "uuid.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-24,14
+20,12
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#include "wx/setup.h"
-
#if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )
#if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )
-// standard headers
-#if wxCHECK_W32API_VERSION( 1, 0 )
+#ifndef WX_PRECOMP
#include "wx/msw/wrapwin.h"
#endif
#include "wx/msw/wrapwin.h"
#endif
+
#include <rpc.h> // UUID related functions
#include "wx/msw/ole/uuid.h"
#include <rpc.h> // UUID related functions
#include "wx/msw/ole/uuid.h"
@@
-48,8
+42,8
@@
// copy ctor
Uuid::Uuid(const Uuid& uuid)
{
// copy ctor
Uuid::Uuid(const Uuid& uuid)
{
- // bitwise copy Ok for UUIDs
- m_uuid = uuid.m_uuid;
+ // bitwise copy Ok for UUIDs
+ m_uuid = uuid.m_uuid;
// force the string to be allocated by RPC
// (we free it later with RpcStringFree)
// force the string to be allocated by RPC
// (we free it later with RpcStringFree)
@@
-89,11
+83,11
@@
Uuid& Uuid::operator=(const Uuid& uuid)
}
// dtor
}
// dtor
-Uuid::~Uuid()
-{
+Uuid::~Uuid()
+{
// this string must be allocated by RPC!
// (otherwise you get a debug breakpoint deep inside RPC DLL)
// this string must be allocated by RPC!
// (otherwise you get a debug breakpoint deep inside RPC DLL)
- if ( m_pszUuid )
+ if ( m_pszUuid )
#ifdef _UNICODE
RpcStringFree((unsigned short **)&m_pszUuid);
#else
#ifdef _UNICODE
RpcStringFree((unsigned short **)&m_pszUuid);
#else
@@
-129,7
+123,7
@@
void Uuid::Create()
// can't fail
UuidCreate(&uuid);
// can't fail
UuidCreate(&uuid);
-
+
Set(uuid);
}
Set(uuid);
}
@@
-143,7
+137,7
@@
bool Uuid::Set(const wxChar *pc)
if ( UuidFromString((wxUChar *)pc, &m_uuid) != RPC_S_OK)
#endif
// failed: probably invalid string
if ( UuidFromString((wxUChar *)pc, &m_uuid) != RPC_S_OK)
#endif
// failed: probably invalid string
- return
FALSE
;
+ return
false
;
// transform it back to string to normalize it
#ifdef _UNICODE
// transform it back to string to normalize it
#ifdef _UNICODE
@@
-155,7
+149,7
@@
bool Uuid::Set(const wxChar *pc)
// update m_pszCForm
UuidToCForm();
// update m_pszCForm
UuidToCForm();
- return
TRUE
;
+ return
true
;
}
// stores m_uuid in m_pszCForm in a format required by
}
// stores m_uuid in m_pszCForm in a format required by