projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move ScrollWindow() implementation to the base class and call private DoScrollHorz...
[wxWidgets.git]
/
include
/
wx
/
x11
/
clipbrd.h
diff --git
a/include/wx/x11/clipbrd.h
b/include/wx/x11/clipbrd.h
index 0abdaf4759dffaacfa21fa5af956a3d760937a03..48a7c70350257b07261cabc9a9e2f3f585423914 100644
(file)
--- a/
include/wx/x11/clipbrd.h
+++ b/
include/wx/x11/clipbrd.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: clipbrd.h
+// Name:
wx/x11/
clipbrd.h
// Purpose: Clipboard functionality.
// Author: Robert Roebling
// Created: 17/09/98
// Purpose: Clipboard functionality.
// Author: Robert Roebling
// Created: 17/09/98
@@
-8,8
+8,8
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef _
_X11CLIPBOARDH_
_
-#define _
_X11CLIPBOARDH_
_
+#ifndef _
WX_X11_CLIPBRD_H
_
+#define _
WX_X11_CLIPBRD_H
_
#if wxUSE_CLIPBOARD
#if wxUSE_CLIPBOARD
@@
-27,7
+27,7
@@
class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
{
public:
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();
@@
-53,11
+53,6
@@
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();
- // If primary == TRUE, use primary selection in all further ops,
- // primary == FALSE resets it.
- virtual void UsePrimarySelection(bool primary = TRUE)
- { m_usePrimary = primary; }
-
// implementation from now on
bool m_open;
bool m_ownsClipboard;
// implementation from now on
bool m_open;
bool m_ownsClipboard;
@@
-70,15
+65,12
@@
public:
bool m_formatSupported;
Atom m_targetRequested;
bool m_formatSupported;
Atom m_targetRequested;
- bool m_usePrimary;
wxDataObject *m_receivedData;
private:
DECLARE_DYNAMIC_CLASS(wxClipboard)
};
wxDataObject *m_receivedData;
private:
DECLARE_DYNAMIC_CLASS(wxClipboard)
};
-#endif
- // wxUSE_CLIPBOARD
+#endif // wxUSE_CLIPBOARD
-#endif
- // __X11CLIPBOARDH__
+#endif // _WX_X11_CLIPBRD_H_