projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed wxString::Last() to run in O(1), not O(n), in UTF-8 build
[wxWidgets.git]
/
include
/
wx
/
os2
/
clipbrd.h
diff --git
a/include/wx/os2/clipbrd.h
b/include/wx/os2/clipbrd.h
index f637d8de70534cb951d1e7de09c700c86568f4ff..729b956dfe28c6cabb75ee1aad62eeeb95fc0aac 100644
(file)
--- a/
include/wx/os2/clipbrd.h
+++ b/
include/wx/os2/clipbrd.h
@@
-2,8
+2,8
@@
// Name: clipbrd.h
// Purpose: Clipboard functionality.
// Note: this functionality is under review, and
// Name: clipbrd.h
// Purpose: Clipboard functionality.
// Note: this functionality is under review, and
-// is derived from wxWi
ndow
s 1.xx code. Please contact
-// the wxWi
ndow
s developers for further information.
+// is derived from wxWi
dget
s 1.xx code. Please contact
+// the wxWi
dget
s developers for further information.
// Author: David Webster
// Modified by:
// Created: 10/13/99
// Author: David Webster
// Modified by:
// Created: 10/13/99
@@
-51,13
+51,13
@@
WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxDataObject;
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxDataObject;
-class WXDLLEXPORT wxClipboard : public wx
Object
+class WXDLLEXPORT wxClipboard : public wx
ClipboardBase
{
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();
@@
-75,7
+75,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 );
@@
-88,13
+88,9
@@
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:
bool m_clearOnExit;
};
#endif // wxUSE_CLIPBOARD
private:
bool m_clearOnExit;
};
#endif // wxUSE_CLIPBOARD
-#endif
- // _WX_CLIPBRD_H_
+#endif // _WX_CLIPBRD_H_