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 7a7c8a84ed4361ba3eefacc6dffa9fe5ef5df8c2..23b6141f24053d587804006a9cde42596a3fac45 100644 (file)
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -51,12 +51,8 @@ public:
     Max
   };
 
     Max
   };
 

-  #ifdef  __DEBUG__
-    // function to return symbolic name of clipboard format (debug messages)
-    static const char *GetFormatName(wxDataFormat format);
-  #else // not used in release mode
-    inline const char* GetFormatName(wxDataFormat format) { return ""; }
-  #endif
+  // function to return symbolic name of clipboard format (debug messages)
+  static const char *GetFormatName(wxDataFormat format);

 
   // ctor & dtor
   wxDataObject();
 
   // ctor & dtor
   wxDataObject();


@@ -94,7 +90,7 @@ public:
 
   // implement base class pure virtuals
   virtual wxDataFormat GetPreferredFormat() const
 
   // 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
   virtual bool IsSupportedFormat(wxDataFormat format) const
     { return format == wxDataObject::Text || format == wxDataObject::Locale; }
   virtual uint GetDataSize() const