wxCALLBACK added, wxCOMPFUNC_CONV moved to defs.h

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

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 33e15b6a429077a59ed8620bea2b72a60fc9558e..c1afb26016c9958d961f38213bef5fb2e84fc307 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -23,6 +23,7 @@
 
 #include "wx/list.h"
 #include "wx/module.h"
 
 #include "wx/list.h"
 #include "wx/module.h"

+#include "wx/dataobj.h"     // for wxDataFormat

 
 // These functions superceded by wxClipboard, but retained in order to
 // implement wxClipboard, and for compatibility.
 
 // These functions superceded by wxClipboard, but retained in order to
 // implement wxClipboard, and for compatibility.


@@ -44,9 +45,9 @@ WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat,
 // clipboard formats
 WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
 WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(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,
 WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,

-                                          char *formatName,
+                                          wxChar *formatName,

                                           int maxCount);
 
 //-----------------------------------------------------------------------------
                                           int maxCount);
 
 //-----------------------------------------------------------------------------


@@ -82,6 +83,10 @@ public:
 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();

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

 };
 
 // The global clipboard object
 };
 
 // The global clipboard object