Quote file names with spaces in wxFileType::ExpandCommand().

[wxWidgets.git] / src / osx / carbon / clipbrd.cpp

diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp
index 1fa330c6d383cb817cc4ee92e28c70f67b1777fa..a534352a9c686f80cedc00fc90cabf28618f6c0f 100644 (file)
--- a/src/osx/carbon/clipbrd.cpp
+++ b/src/osx/carbon/clipbrd.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/clipbrd.cpp
+// Name:        src/osx/carbon/clipbrd.cpp

 // Purpose:     Clipboard functionality
 // Author:      Stefan Csomor;
 //              Generalized clipboard implementation by Matthew Flatt
 // Purpose:     Clipboard functionality
 // Author:      Stefan Csomor;
 //              Generalized clipboard implementation by Matthew Flatt


@@ -36,7 +36,7 @@
 // the trace mask we use with wxLogTrace() - call
 // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
 // (there will be a *lot* of them!)
 // the trace mask we use with wxLogTrace() - call
 // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
 // (there will be a *lot* of them!)

-#define TRACE_CLIPBOARD _T("clipboard")
+#define TRACE_CLIPBOARD wxT("clipboard")

 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 


@@ -142,7 +142,7 @@ void wxClipboard::Close()
     if (m_data)
     {
         delete m_data;
     if (m_data)
     {
         delete m_data;

-        m_data = (wxDataObject*) NULL;
+        m_data = NULL;

     }
 }
 
     }
 }