Add support for EVT_WEB_VIEW_NEWWINDOW to the OSX WebKit backend.

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

diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp
index 8bc1f65703a5fc81ccb12b5c9d9b1d270bd3bb39..293173c9ec9c387359b1ec670a8c1b61715a598c 100644 (file)
--- a/src/osx/carbon/clipbrd.cpp
+++ b/src/osx/carbon/clipbrd.cpp
@@ -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)
 


@@ -61,11 +61,9 @@ wxClipboard::~wxClipboard()
 
 void wxClipboard::Clear()
 {
 
 void wxClipboard::Clear()
 {

-    if (m_data != NULL)
-    {
-        delete m_data;
-        m_data = NULL;
-    }
+    wxDELETE(m_data);
+
+    wxCHECK_RET( m_pasteboard, "Clipboard creation failed." );

 
     OSStatus err = PasteboardClear( m_pasteboard );
     if (err != noErr)
 
     OSStatus err = PasteboardClear( m_pasteboard );
     if (err != noErr)


@@ -139,11 +137,7 @@ void wxClipboard::Close()
     // Get rid of cached object.
     // If this is not done, copying data from
     // another application will only work once
     // Get rid of cached object.
     // If this is not done, copying data from
     // another application will only work once

-    if (m_data)
-    {
-        delete m_data;
-        m_data = NULL;
-    }
+    wxDELETE(m_data);

 }
 
 bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )
 }
 
 bool wxClipboard::IsSupported( const wxDataFormat &dataFormat )