X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a5bcc4db0851bf8cd3063917511b0b17c7f9679..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/msw/ole/uuid.h diff --git a/include/wx/msw/ole/uuid.h b/include/wx/msw/ole/uuid.h index c194a4e417..59604e7f3a 100644 --- a/include/wx/msw/ole/uuid.h +++ b/include/wx/msw/ole/uuid.h @@ -2,7 +2,7 @@ // Name: ole/uuid.h // Purpose: encapsulates an UUID with some added helper functions // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 11.07.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin @@ -14,10 +14,7 @@ #ifndef _WX_OLEUUID_H #define _WX_OLEUUID_H -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "uuid.h" -#endif -#include "wx/wxchar.h" +#include "wx/chartype.h" // ------------------------------------------------------------------ // UUID (Universally Unique IDentifier) definition // ------------------------------------------------------------------ @@ -25,7 +22,7 @@ // ----- taken from RPC.H #ifndef UUID_DEFINED // in some cases RPC.H will be already #ifdef __WIN32__ // included, so avoid redefinition - typedef struct + typedef struct { unsigned long Data1; unsigned short Data2; @@ -51,7 +48,7 @@ class WXDLLEXPORT Uuid { private: UUID m_uuid; - wxUChar *m_pszUuid; // this string is alloc'd and freed by RPC + wxUChar *m_pszUuid; // this string is alloc'd and freed by RPC wxChar *m_pszCForm; // this string is allocated in Set/Create void UuidToCForm(); @@ -73,7 +70,7 @@ public: // create a brand new UUID void Create(); - // set value of UUID + // set value of UUID bool Set(const wxChar *pc); // from a string, returns true if ok void Set(const UUID& uuid); // from another UUID (never fails)