mingw compilation fix

[wxWidgets.git] / src / msw / clipbrd.cpp

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 5386a032e6af6406b179eedba114521c9d8adb8d..d01c281dae821ac4e39ec8bef2c08ef0476ad54a 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -69,8 +69,8 @@
 #endif
 
 #if wxUSE_OLE
 #endif
 
 #if wxUSE_OLE

-   // use OLE clipboard
-   #define wxUSE_OLE_CLIPBOARD 1
+    // use OLE clipboard
+    #define wxUSE_OLE_CLIPBOARD 1

 #else // !wxUSE_DATAOBJ
     // use Win clipboard API
     #define wxUSE_OLE_CLIPBOARD 0
 #else // !wxUSE_DATAOBJ
     // use Win clipboard API
     #define wxUSE_OLE_CLIPBOARD 0


@@ -633,7 +633,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     // build the list of supported formats
     size_t nFormats = data.GetFormatCount(wxDataObject::Set);
     wxDataFormat format;
     // build the list of supported formats
     size_t nFormats = data.GetFormatCount(wxDataObject::Set);
     wxDataFormat format;

-       wxDataFormat *formats;
+    wxDataFormat *formats;

     if ( nFormats == 1 )
     {
         // the most common case
     if ( nFormats == 1 )
     {
         // the most common case


@@ -828,7 +828,5 @@ bool wxClipboard::GetData( wxDataObject& data )
 #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }
 
 #endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }
 

-#else
-//    #error "Please turn wxUSE_CLIPBOARD on to compile this file."

 #endif // wxUSE_CLIPBOARD
 
 #endif // wxUSE_CLIPBOARD