1) APPCONF_ constants renamed to wxCONFIG_

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

diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index cdad68606cf61dc6f58e31c5f4cb4e2e911e6114..23b6141f24053d587804006a9cde42596a3fac45 100644 (file)
--- 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