1. wxChoice and wxComboBox support client data under MSW

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

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 85ba54c3a6f1f1396fae9b08a3e50f1e6ab21150..c1afb26016c9958d961f38213bef5fb2e84fc307 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -45,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);
 
 //-----------------------------------------------------------------------------


@@ -83,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