MSW compilation fixes (untested)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/dataobj.h

@@ -187,7 +187,7 @@ class WXDLLEXPORT wxDataObjectSimple : public wxDataObject
 public:
     // ctor takes the format we support, but it can also be set later with
     // SetFormat()
-    wxDataObjectSimple(const wxDataFormat& format = wxDataFormat(wxDF_INVALID))
+    wxDataObjectSimple(const wxDataFormat& format = wxFormatInvalid)
         : m_format(format)
         {
         }

include/wx/msw/clipbrd.h

@@ -79,7 +79,7 @@ public:
     virtual bool IsSupported( wxDataFormat format );
 
     // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject *data );
+    virtual bool GetData( wxDataObject& data );
 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();

include/wx/msw/ole/dataobj.h

@@ -39,9 +39,15 @@ public:
     // return TRUE if we support this format in "Get" direction
     bool IsSupportedFormat(const wxDataFormat& format) const;
 
+#ifdef __WXDEBUG__
     // function to return symbolic name of clipboard format (for debug messages)
     static const char *GetFormatName(wxDataFormat format);
 
+    #define wxGetFormatName(format) wxDataObject::GetFormatName(format)
+#else // !Debug
+    #define wxGetFormatName(format) ""
+#endif // Debug/!Debug
+
 private:
     IDataObject *m_pIDataObject; // pointer to the COM interface
 };