Spelling fixes [#1017001], source cleaning.

[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 157ec93a447091d6dbe059e9edfb225cc3162f9a..9dc4716278296bcdb0932728dc088a8c31ddf2b8 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -12,7 +12,7 @@
 #ifndef   _WX_OLEUTILS_H
 #define   _WX_OLEUTILS_H
 
 #ifndef   _WX_OLEUTILS_H
 #define   _WX_OLEUTILS_H
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "oleutils.h"
 #endif
 
 #pragma interface "oleutils.h"
 #endif
 


@@ -39,7 +39,7 @@ inline void ReleaseInterface(IUnknown *pIUnk)
 // release the interface pointer (if !NULL) and make it NULL
 #define   RELEASE_AND_NULL(p)   if ( (p) != NULL ) { p->Release(); p = NULL; };
 
 // release the interface pointer (if !NULL) and make it NULL
 #define   RELEASE_AND_NULL(p)   if ( (p) != NULL ) { p->Release(); p = NULL; };
 

-// return TRUE if the iid is in the array
+// return true if the iid is in the array

 extern bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
 
 // ============================================================================
 extern bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
 
 // ============================================================================


@@ -72,8 +72,8 @@ public:
     wxAutoULong(ULONG value = 0) : m_Value(value) { }
 
     operator ULONG&() { return m_Value; }
     wxAutoULong(ULONG value = 0) : m_Value(value) { }
 
     operator ULONG&() { return m_Value; }

-    ULONG& operator=(ULONG value) { return m_Value = value; }
-    
+    ULONG& operator=(ULONG value) { m_Value = value; return m_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; }
 


@@ -176,20 +176,20 @@ public:
     wxBasicString(const char *sz);
     wxBasicString(const wxString& str);
     ~wxBasicString();
     wxBasicString(const char *sz);
     wxBasicString(const wxString& str);
     ~wxBasicString();

-    
+

     void Init(const char* sz);
     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); }
     // 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&);
 private:
     // @@@ not implemented (but should be)
     wxBasicString(const wxBasicString&);
     wxBasicString& operator=(const wxBasicString&);

-    
+

     OLECHAR *m_wzBuf;     // actual string
 };
 
     OLECHAR *m_wzBuf;     // actual string
 };