compilation fix for wxOSX_USE_EXPERIMENTAL_FONTDIALOG==0 (closes #10834)

[wxWidgets.git] / src / msw / ole / dataobj.cpp

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index ff9169dbe59035158d104a6273762b8a4a8ac12a..e112f436e8c8591b4517a7bacd08c830e5c4e7f8 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -61,11 +61,11 @@
 // functions
 // ----------------------------------------------------------------------------
 
 // functions
 // ----------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     static const wxChar *GetTymedName(DWORD tymed);
     static const wxChar *GetTymedName(DWORD tymed);

-#else // !Debug
+#else // !wxDEBUG_LEVEL

     #define GetTymedName(tymed) wxEmptyString
     #define GetTymedName(tymed) wxEmptyString

-#endif // Debug/!Debug
+#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL

 
 // ----------------------------------------------------------------------------
 // wxIEnumFORMATETC interface implementation
 
 // ----------------------------------------------------------------------------
 // wxIEnumFORMATETC interface implementation


@@ -90,7 +90,7 @@ private:
     ULONG       m_nCount,   // number of formats we support
                 m_nCurrent; // current enum position
 
     ULONG       m_nCount,   // number of formats we support
                 m_nCurrent; // current enum position
 

-    DECLARE_NO_COPY_CLASS(wxIEnumFORMATETC)
+    wxDECLARE_NO_COPY_CLASS(wxIEnumFORMATETC);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -126,7 +126,7 @@ private:
 
     bool m_mustDelete;
 
 
     bool m_mustDelete;
 

-    DECLARE_NO_COPY_CLASS(wxIDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxIDataObject);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -719,7 +719,7 @@ void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
     return p;
 }
 
     return p;
 }
 

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

 
 const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
 {
 
 const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
 {


@@ -764,7 +764,7 @@ const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
     #endif // VC++
 }
 
     #endif // VC++
 }
 

-#endif // Debug
+#endif // wxDEBUG_LEVEL

 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject supports CF_DIB format
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject supports CF_DIB format


@@ -1199,7 +1199,7 @@ public:
         { return GetDataHere(buf); }
 #endif
 
         { return GetDataHere(buf); }
 #endif
 

-    DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject)
+    wxDECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject);

 };
 
 
 };
 
 


@@ -1256,7 +1256,8 @@ void wxURLDataObject::SetURL(const wxString& url)
     }
 
 #if wxUSE_UNICODE
     }
 
 #if wxUSE_UNICODE

-    SetData(wxDF_UNICODETEXT, url.length() + 1, url.wc_str());
+    // notice that SetData() takes size in bytes
+    SetData(wxDF_UNICODETEXT, (url.length() + 1)*sizeof(wxChar), url.wc_str());

 #endif
 }
 
 #endif
 }
 


@@ -1264,7 +1265,7 @@ void wxURLDataObject::SetURL(const wxString& url)
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

 
 static const wxChar *GetTymedName(DWORD tymed)
 {
 
 static const wxChar *GetTymedName(DWORD tymed)
 {


@@ -1305,12 +1306,10 @@ void wxDataObject::SetAutoDelete()
 {
 }
 
 {
 }
 

-#ifdef __WXDEBUG__

 const wxChar *wxDataObject::GetFormatName(wxDataFormat WXUNUSED(format))
 {
     return NULL;
 }
 const wxChar *wxDataObject::GetFormatName(wxDataFormat WXUNUSED(format))
 {
     return NULL;
 }

-#endif // __WXDEBUG__

 
 #endif // wxUSE_DATAOBJ
 
 
 #endif // wxUSE_DATAOBJ