removed unsecure wxTmpnam() function (patch by Francesco Montorsi)

[wxWidgets.git] / include / wx / msw / clipbrd.h

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 7d8b873c1178e0d4fdae5ff587d5c56a95942d70..2a760e267641ebe5d40337a3173f09fb765deed7 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "clipbrd.h"
-#endif
-

 #if wxUSE_CLIPBOARD
 
 #include "wx/list.h"
 #if wxUSE_CLIPBOARD
 
 #include "wx/list.h"


@@ -52,13 +48,13 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxDataObject;
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxDataObject;

-class WXDLLEXPORT wxClipboard : public wxObject
+class WXDLLEXPORT wxClipboard : public wxClipboardBase

 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
     wxClipboard();
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 public:
     wxClipboard();

-    ~wxClipboard();
+    virtual ~wxClipboard();

 
     // open the clipboard before SetData() and GetData()
     virtual bool Open();
 
     // open the clipboard before SetData() and GetData()
     virtual bool Open();


@@ -76,7 +72,7 @@ public:
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available

-    virtual bool IsSupported( wxDataFormat format );
+    virtual bool IsSupported( const wxDataFormat& format );

 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data );
 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data );


@@ -89,14 +85,11 @@ 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:
 private:

-    bool m_clearOnExit;
+    IDataObject *m_lastDataObject;

     bool m_isOpened;
 };
 
 #endif // wxUSE_CLIPBOARD
     bool m_isOpened;
 };
 
 #endif // wxUSE_CLIPBOARD

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