add WXWIN_COMPATIBILITY_2_8 test around another wxLogTrace(wxTraceMask) occurrence

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

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index ba2cb10bc83ef1fff0fff953d1da613aeab14322..07884ba7ede2f9f8609e4bb6e72e7e3380383a3e 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


@@ -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


@@ -1264,7 +1264,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 +1305,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