define MIIM_BITMAP &c in wx/msw/missing.h instead of msw/menu.cpp as menuitem.cpp...

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

diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp
index c05e24d120d2291059a60f0308f49ec94105e7ae..8bc1f65703a5fc81ccb12b5c9d9b1d270bd3bb39 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


@@ -27,7 +27,7 @@
 
 #include "wx/metafile.h"
 
 
 #include "wx/metafile.h"
 

-#include "wx/osx/uma.h"
+#include "wx/osx/private.h"

 
 #define wxUSE_DATAOBJ 1
 
 
 #define wxUSE_DATAOBJ 1
 


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

     }
 }
 
     }
 }