#ifdefed wxPopupComboWindow to be used only in wxUniv

[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 2dee9946aa7e85400a6aa2de40f4ebf51a6a5cfc..b70672d3e314bdbb3f2540f935bc12aaa519ecb3 100644 (file)
--- a/include/wx/msw/ole/uuid.h
+++ b/include/wx/msw/ole/uuid.h
@@ -17,7 +17,7 @@
 #ifdef __GNUG__
 #pragma interface "uuid.h"
 #endif
 #ifdef __GNUG__
 #pragma interface "uuid.h"
 #endif

-
+#include "wx/wxchar.h"

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


@@ -53,8 +53,8 @@ class WXDLLEXPORT Uuid
 {
 private:
   UUID  m_uuid;
 {
 private:
   UUID  m_uuid;

-  uchar *m_pszUuid;   // this string is alloc'd and freed by RPC 
-  char  *m_pszCForm;  // this string is allocated in Set/Create
+  wxUChar *m_pszUuid;   // this string is alloc'd and freed by RPC 
+  wxChar  *m_pszCForm;  // this string is allocated in Set/Create

 
   void  UuidToCForm();
 
 
   void  UuidToCForm();
 


@@ -64,7 +64,7 @@ private:
 public:
   // ctors & dtor
   Uuid()                 { Init();            }
 public:
   // ctors & dtor
   Uuid()                 { Init();            }

-  Uuid(const char *pc)   { Init(); Set(pc);   }
+  Uuid(const wxChar *pc) { Init(); Set(pc);   }

   Uuid(const UUID &uuid) { Init(); Set(uuid); }
  ~Uuid();
 
   Uuid(const UUID &uuid) { Init(); Set(uuid); }
  ~Uuid();
 


@@ -76,16 +76,16 @@ public:
   void Create();
 
   // set value of UUID 
   void Create();
 
   // set value of UUID 

-  bool Set(const char *pc);   // from a string, returns true if ok
+  bool Set(const wxChar *pc); // from a string, returns true if ok

   void Set(const UUID& uuid); // from another UUID (never fails)
 
   // accessors
   void Set(const UUID& uuid); // from another UUID (never fails)
 
   // accessors

-  operator const UUID*() const { return &m_uuid;             }
-  operator const char*() const { return (char *)(m_pszUuid); }
+  operator const UUID*()   const { return &m_uuid;               }
+  operator const wxChar*() const { return (wxChar *)(m_pszUuid); }

 
   // return string representation of the UUID in the C form
   // (as in DEFINE_GUID macro)
 
   // return string representation of the UUID in the C form
   // (as in DEFINE_GUID macro)

-  const char *CForm() const    { return m_pszCForm;          }
+  const wxChar *CForm() const    { return m_pszCForm;            }

 };
 
 #endif //_WX_OLEUUID_H
 };
 
 #endif //_WX_OLEUUID_H