projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use new string caching code without compiler TLS support (temporary fix to...
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
clipbrd.h
diff --git
a/include/wx/gtk1/clipbrd.h
b/include/wx/gtk1/clipbrd.h
index 38f7c427c94fcff96cd600f34e7387e7bf703fd9..eb0240467841464186c1704195f099df4b6c5e2c 100644
(file)
--- a/
include/wx/gtk1/clipbrd.h
+++ b/
include/wx/gtk1/clipbrd.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: clipboard.h
+// Name:
wx/gtk1/
clipboard.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-11,10
+11,6
@@
#ifndef __GTKCLIPBOARDH__
#define __GTKCLIPBOARDH__
#ifndef __GTKCLIPBOARDH__
#define __GTKCLIPBOARDH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
#if wxUSE_CLIPBOARD
#include "wx/object.h"
#if wxUSE_CLIPBOARD
#include "wx/object.h"
@@
-27,11
+23,11
@@
// wxClipboard
// ----------------------------------------------------------------------------
// wxClipboard
// ----------------------------------------------------------------------------
-class wxClipboard : public wxClipboardBase
+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();
@@
-57,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;
@@
-74,7
+65,6
@@
public:
bool m_formatSupported;
GdkAtom m_targetRequested;
bool m_formatSupported;
GdkAtom m_targetRequested;
- bool m_usePrimary;
wxDataObject *m_receivedData;
private:
wxDataObject *m_receivedData;
private: