First part of '[ 1216148 ] cleanup: unused variables and declarations'.

[wxWidgets.git] / src / msw / ole / dataobj.cpp

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index b00c440a15573a2f42852b31de2323a509a5d4bb..e26a1ea1d5c7ab54020f1820b64a3f4df2aba616 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -106,7 +106,7 @@ public:
     virtual ~wxIDataObject();
 
     // normally, wxDataObject controls our lifetime (i.e. we're deleted when it
     virtual ~wxIDataObject();
 
     // normally, wxDataObject controls our lifetime (i.e. we're deleted when it

-    // is), but in some cases, the situation is inversed, that is we delete it
+    // is), but in some cases, the situation is reversed, that is we delete it

     // when this object is deleted - setting this flag enables such logic
     void SetDeleteFlag() { m_mustDelete = true; }
 
     // when this object is deleted - setting this flag enables such logic
     void SetDeleteFlag() { m_mustDelete = true; }
 


@@ -500,7 +500,7 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                             // we suppose that the size precedes the data
                             pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format );
                             if (! format.IsStandard() ) {
                             // we suppose that the size precedes the data
                             pBuf = m_pDataObject->GetSizeFromBuffer( pBuf, &size, format );
                             if (! format.IsStandard() ) {

-                                // see GetData for coresponding increment
+                                // see GetData for corresponding increment

                                 size -= m_pDataObject->GetBufferOffset( format  );
                             }
                         }
                                 size -= m_pDataObject->GetBufferOffset( format  );
                             }
                         }


@@ -1224,6 +1224,7 @@ static const wxChar *GetTymedName(DWORD tymed)
 #endif // Debug
 
 #else // not using OLE at all
 #endif // Debug
 
 #else // not using OLE at all

+

 // ----------------------------------------------------------------------------
 // wxDataObject
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDataObject
 // ----------------------------------------------------------------------------


@@ -1243,13 +1244,14 @@ void wxDataObject::SetAutoDelete()
 }
 
 #ifdef __WXDEBUG__
 }
 
 #ifdef __WXDEBUG__

-const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
+const wxChar *wxDataObject::GetFormatName(wxDataFormat WXUNUSED(format))

 {
     return NULL;
 }
 {
     return NULL;
 }

-#endif
+#endif // __WXDEBUG__

 
 

-#endif
+#endif // wxUSE_DATAOBJ
+
+#endif // wxUSE_OLE/!wxUSE_OLE

 
 

-#endif