native wxBitmapComboBox implementation for MSW (patch 1941399)

[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 b70672d3e314bdbb3f2540f935bc12aaa519ecb3..7bafccaa6027c2dc1bed1726484dfea727e8ce12 100644 (file)
--- 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
 // 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 <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     11.07.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


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

-#ifdef __GNUG__
-#pragma interface "uuid.h"
-#endif
-#include "wx/wxchar.h"
+#include "wx/chartype.h"

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


@@ -25,15 +22,13 @@
 // ----- taken from RPC.H
 #ifndef UUID_DEFINED            // in some cases RPC.H will be already
   #ifdef  __WIN32__             // included, so avoid redefinition
 // ----- 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;
       unsigned short  Data3;
       unsigned char   Data4[8];
     } UUID;                     // UUID = GUID = CLSID = LIBID = IID
     {
       unsigned long   Data1;
       unsigned short  Data2;
       unsigned short  Data3;
       unsigned char   Data4[8];
     } UUID;                     // UUID = GUID = CLSID = LIBID = IID

-  #else   // WIN16
-    #error "Don't know about UUIDs on this platform"

   #endif  // WIN32
 #endif  // UUID_DEFINED
 
   #endif  // WIN32
 #endif  // UUID_DEFINED
 


@@ -49,11 +44,11 @@ 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;

-  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();
   wxChar  *m_pszCForm;  // this string is allocated in Set/Create
 
   void  UuidToCForm();


@@ -75,7 +70,7 @@ public:
   // create a brand new UUID
   void Create();
 
   // 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)
 
   bool Set(const wxChar *pc); // from a string, returns true if ok
   void Set(const UUID& uuid); // from another UUID (never fails)