X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1737035fb878c6fd62c69057a027280d60be1d5a..da468d387db3b7e22b008bf08be2ff6b202508fb:/include/wx/msw/ole/dataobj.h

diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index cdad68606c..23b6141f24 100644
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -51,10 +51,8 @@ public:
     Max
   };
 
-  #ifdef  __DEBUG__
-    // function to return symbolic name of clipboard format (debug messages)
-    static const char *GetFormatName(wxDataFormat format);
-  #endif
+  // function to return symbolic name of clipboard format (debug messages)
+  static const char *GetFormatName(wxDataFormat format);
 
   // ctor & dtor
   wxDataObject();
@@ -92,7 +90,7 @@ public:
 
   // implement base class pure virtuals
   virtual wxDataFormat GetPreferredFormat() const
-    { return wxDataObject::Text; }
+    { return (wxDataFormat) wxDataObject::Text; }
   virtual bool IsSupportedFormat(wxDataFormat format) const
     { return format == wxDataObject::Text || format == wxDataObject::Locale; }
   virtual uint GetDataSize() const
@@ -108,4 +106,4 @@ private:
 // @@@ TODO: wx{Bitmap|Metafile|...}DataObject
 // ----------------------------------------------------------------------------
 
-#endif  //_OLEDATAOBJ_H
\ No newline at end of file
+#endif  //_OLEDATAOBJ_H