fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

[wxWidgets.git] / include / wx / mac / carbon / clipbrd.h

diff --git a/include/wx/mac/carbon/clipbrd.h b/include/wx/mac/carbon/clipbrd.h
index f484bbd7d3c044f0834c40f7f623ef83db565d3b..0c80b03c26e80897a1b2d84e435126218e273fb5 100644 (file)
--- a/include/wx/mac/carbon/clipbrd.h
+++ b/include/wx/mac/carbon/clipbrd.h
@@ -21,11 +21,13 @@
 #include "wx/module.h"
 #include "wx/dataobj.h"     // for wxDataFormat
 
 #include "wx/module.h"
 #include "wx/dataobj.h"     // for wxDataFormat
 

+#include "wx/mac/corefoundation/cfref.h"
+

 //-----------------------------------------------------------------------------
 // wxClipboard
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxClipboard
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDataObject;
+class WXDLLIMPEXP_FWD_CORE wxDataObject;

 class WXDLLEXPORT wxClipboard : public wxClipboardBase
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 class WXDLLEXPORT wxClipboard : public wxClipboardBase
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)


@@ -63,15 +65,12 @@ public:
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 

-    // X11 has two clipboards which get selected by this call. Empty on MSW.
-    void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
-

 private:
     wxDataObject     *m_data;
     bool              m_open;
 private:
     wxDataObject     *m_data;
     bool              m_open;

+    wxCFRef<PasteboardRef> m_pasteboard;

 };
 
 #endif // wxUSE_CLIPBOARD
 
 };
 
 #endif // wxUSE_CLIPBOARD
 

-#endif
-    // _WX_CLIPBRD_H_
+#endif // _WX_CLIPBRD_H_