Avoid CRT deprecation warnings for MSVC build using makefiles too.

[wxWidgets.git] / include / wx / msw / ole / uuid.h

diff --git a/include/wx/msw/ole/uuid.h b/include/wx/msw/ole/uuid.h
index 1bda2dc6803d28a9ce8ceaa12a599df26d898d85..1b31d7373c61b64411f285666e74f208ac4e29f4 100644 (file)
--- a/include/wx/msw/ole/uuid.h
+++ b/include/wx/msw/ole/uuid.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        ole/uuid.h
+// Name:        wx/msw/ole/uuid.h

 // Purpose:     encapsulates an UUID with some added helper functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     encapsulates an UUID with some added helper functions
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -14,7 +14,7 @@
 #ifndef   _WX_OLEUUID_H
 #define   _WX_OLEUUID_H
 
 #ifndef   _WX_OLEUUID_H
 #define   _WX_OLEUUID_H
 

-#include "wx/wxchar.h"
+#include "wx/chartype.h"

 // ------------------------------------------------------------------
 // UUID (Universally Unique IDentifier) definition
 // ------------------------------------------------------------------
 // ------------------------------------------------------------------
 // UUID (Universally Unique IDentifier) definition
 // ------------------------------------------------------------------


@@ -44,7 +44,7 @@ typedef unsigned char uchar;
 // ------------------------------------------------------------------
 
 // uses RPC functions to create/convert Universally Unique Identifiers
 // ------------------------------------------------------------------
 
 // uses RPC functions to create/convert Universally Unique Identifiers

-class WXDLLEXPORT Uuid
+class WXDLLIMPEXP_CORE Uuid

 {
 private:
   UUID  m_uuid;
 {
 private:
   UUID  m_uuid;


@@ -74,6 +74,10 @@ public:
   bool Set(const wxChar *pc); // from a string, returns true if ok
   void Set(const UUID& uuid); // from another UUID (never fails)
 
   bool Set(const wxChar *pc); // from a string, returns true if ok
   void Set(const UUID& uuid); // from another UUID (never fails)
 

+  // comparison operators
+  bool operator==(const Uuid& uuid) const;
+  bool operator!=(const Uuid& uuid) const { return !(*this == uuid); }
+

   // accessors
   operator const UUID*()   const { return &m_uuid;               }
   operator const wxChar*() const { return (wxChar *)(m_pszUuid); }
   // accessors
   operator const UUID*()   const { return &m_uuid;               }
   operator const wxChar*() const { return (wxChar *)(m_pszUuid); }