MinGW compilation fixes.

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

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 85ba54c3a6f1f1396fae9b08a3e50f1e6ab21150..c4a2594970613a7bc06df2c5d90eeddff17a4c92 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        clipbrd.h
-// Purpose:     Clipboard functionality
+// Name:        wx/msw/clipbrd.h
+// Purpose:     wxClipboad class and clipboard functions for MSW
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
@@ -16,9 +16,6 @@
 #pragma interface "clipbrd.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/setup.h"
-
 #if wxUSE_CLIPBOARD
 
 #include "wx/list.h"
@@ -45,9 +42,9 @@ WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat,
 // clipboard formats
 WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
 WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
-WXDLLEXPORT int  wxRegisterClipboardFormat(char *formatName);
+WXDLLEXPORT int  wxRegisterClipboardFormat(wxChar *formatName);
 WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
-                                          char *formatName,
+                                          wxChar *formatName,
                                           int maxCount);
 
 //-----------------------------------------------------------------------------
@@ -69,6 +66,9 @@ public:
     // close the clipboard after SetData() and GetData()
     virtual void Close();
 
+    // query whether the clipboard is opened
+    virtual bool IsOpened() const;
+
     // set the clipboard data. all other formats will be deleted.
     virtual bool SetData( wxDataObject *data );
 
@@ -79,29 +79,22 @@ public:
     virtual bool IsSupported( wxDataFormat format );
 
     // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject *data );
+    virtual bool GetData( wxDataObject& data );
 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
-};
 
-// The global clipboard object
-WXDLLEXPORT_DATA(extern wxClipboard*) wxTheClipboard;
+    // flushes the clipboard: this means that the data which is currently on
+    // clipboard will stay available even after the application exits (possibly
+    // eating memory), otherwise the clipboard will be emptied on exit
+    virtual bool Flush();
 
-//-----------------------------------------------------------------------------
-// wxClipboardModule: module responsible for initializing the global clipboard
-// object
-//-----------------------------------------------------------------------------
-
-class wxClipboardModule : public wxModule
-{
-    DECLARE_DYNAMIC_CLASS(wxClipboardModule)
-
-public:
-    wxClipboardModule() { }
+    // X11 has two clipboards which get selected by this call. Empty on MSW.
+    void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
 
-    bool OnInit();
-    void OnExit();
+private:
+    bool m_clearOnExit;
+    bool m_isOpened;
 };
 
 #endif // wxUSE_CLIPBOARD