cleanup: all definitions missing from std headers should be in missing.h

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

diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 1d19f4f763cc010e23a8456546334e470f73f2df..f8ac24f78eeddffebf797508670c5b2e7dcbbb6f 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -12,15 +12,14 @@
 #ifndef   _WX_OLEUTILS_H
 #define   _WX_OLEUTILS_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "oleutils.h"
 #endif
 
 #include "wx/defs.h"
 
-#if wxUSE_NORLANDER_HEADERS
-    #include <ole2.h>
-#endif
+// get IUnknown, REFIID &c
+#include <ole2.h>
 
 // ============================================================================
 // General purpose functions and macros
@@ -74,6 +73,12 @@ public:
 
     operator ULONG&() { return m_Value; }
     ULONG& operator=(ULONG value) { return m_Value = value; }
+    
+    wxAutoULong& operator++() { ++m_Value; return *this; }
+    const wxAutoULong operator++( int ) { wxAutoULong temp = *this; ++m_Value; return temp; }
+
+    wxAutoULong& operator--() { --m_Value; return *this; }
+    const wxAutoULong operator--( int ) { wxAutoULong temp = *this; --m_Value; return temp; }
 
 private:
     ULONG m_Value;
@@ -129,7 +134,7 @@ private:
   {                                                                           \
     wxLogRelease(_T(#classname), m_cRef);                                     \
                                                                               \
-    if ( --m_cRef == 0 ) {                                                    \
+    if ( --m_cRef == wxAutoULong(0) ) {                                                    \
       delete this;                                                            \
       return 0;                                                               \
     }                                                                         \
@@ -162,5 +167,44 @@ void wxLogRelease(const wxChar *szInterface, ULONG cRef);
   #define   wxLogRelease(szInterface, cRef)
 #endif  //WXDEBUG
 
+// wrapper around BSTR type (by Vadim Zeitlin)
+
+class WXDLLEXPORT wxBasicString
+{
+public:
+    // ctors & dtor
+    wxBasicString(const char *sz);
+    wxBasicString(const wxString& str);
+    ~wxBasicString();
+    
+    void Init(const char* sz);
+    
+    // accessors
+    // just get the string
+    operator BSTR() const { return m_wzBuf; }
+    // retrieve a copy of our string - caller must SysFreeString() it later!
+    BSTR Get() const { return SysAllocString(m_wzBuf); }
+    
+private:
+    // @@@ not implemented (but should be)
+    wxBasicString(const wxBasicString&);
+    wxBasicString& operator=(const wxBasicString&);
+    
+    OLECHAR *m_wzBuf;     // actual string
+};
+
+// Convert variants
+class WXDLLEXPORT wxVariant;
+
+bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) ;
+bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) ;
+
+// Convert string to Unicode
+BSTR wxConvertStringToOle(const wxString& str);
+
+// Convert string from BSTR to wxString
+wxString wxConvertStringFromOle(BSTR bStr);
+
+
 #endif  //_WX_OLEUTILS_H