projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
declare the wx2os2PenStyle helper in the header.
[wxWidgets.git]
/
include
/
wx
/
clipbrd.h
diff --git
a/include/wx/clipbrd.h
b/include/wx/clipbrd.h
index ad50734933779ac3dcca5b8c65e9d83f7f2ef51e..e7ab30b41e6ad1c37294cdf61fb184c1822a8742 100644
(file)
--- a/
include/wx/clipbrd.h
+++ b/
include/wx/clipbrd.h
@@
-12,10
+12,15
@@
#ifndef _WX_CLIPBRD_H_BASE_
#define _WX_CLIPBRD_H_BASE_
#ifndef _WX_CLIPBRD_H_BASE_
#define _WX_CLIPBRD_H_BASE_
+#ifdef __GNUG__
+ #pragma interface "clipboardbase.h"
+#endif
+
#include "wx/defs.h"
#if wxUSE_CLIPBOARD
#include "wx/defs.h"
#if wxUSE_CLIPBOARD
+
#include "wx/object.h"
#include "wx/wxchar.h"
#include "wx/object.h"
#include "wx/wxchar.h"
@@
-33,30
+38,35
@@
class WXDLLEXPORT wxDataObject;
class WXDLLEXPORT wxClipboardBase : public wxObject
{
public:
class WXDLLEXPORT wxClipboardBase : public wxObject
{
public:
+ wxClipboardBase();
+
// open the clipboard before Add/SetData() and GetData()
// open the clipboard before Add/SetData() and GetData()
- virtual bool Open();
+ virtual bool Open()
= 0
;
// close the clipboard after Add/SetData() and GetData()
// close the clipboard after Add/SetData() and GetData()
- virtual void Close();
+ virtual void Close() = 0;
+
+ // query whether the clipboard is opened
+ virtual bool IsOpened() const = 0;
// add to the clipboard data
//
// NB: the clipboard owns the pointer and will delete it, so data must be
// allocated on the heap
// add to the clipboard data
//
// NB: the clipboard owns the pointer and will delete it, so data must be
// allocated on the heap
- virtual bool AddData( wxDataObject *data );
+ virtual bool AddData( wxDataObject *data )
= 0
;
// set the clipboard data, this is the same as Clear() followed by
// AddData()
// set the clipboard data, this is the same as Clear() followed by
// AddData()
- virtual bool SetData( wxDataObject *data );
+ virtual bool SetData( wxDataObject *data )
= 0
;
// ask if data in correct format is available
// ask if data in correct format is available
- virtual bool IsSupported( const wxDataFormat& format );
+ virtual bool IsSupported( const wxDataFormat& format )
= 0
;
// fill data with data on the clipboard (if available)
// fill data with data on the clipboard (if available)
- virtual bool GetData( wxDataObject& data );
-
+ virtual bool GetData( wxDataObject& data )
= 0
;
+
// clears wxTheClipboard and the system's clipboard if possible
// clears wxTheClipboard and the system's clipboard if possible
- virtual void Clear();
+ virtual void Clear()
= 0
;
// flushes the clipboard: this means that the data which is currently on
// clipboard will stay available even after the application exits (possibly
// flushes the clipboard: this means that the data which is currently on
// clipboard will stay available even after the application exits (possibly
@@
-66,15
+76,6
@@
public:
// X11 has two clipboards which get selected by this call. Empty on MSW.
virtual void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
// X11 has two clipboards which get selected by this call. Empty on MSW.
virtual void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
-#ifdef WXWIN_COMPATIBILITY_2
- // deprecated version
- bool GetData(wxDataObject *data)
- {
- wxCHECK_MSG(data, FALSE, wxT("NULL pointer in wxClipboard"));
-
- return GetData(*data);
- }
-#endif // WXWIN_COMPATIBILITY_2
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-105,22
+106,33
@@
public:
WXDLLEXPORT_DATA(extern wxClipboard *) wxTheClipboard;
// ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(extern wxClipboard *) wxTheClipboard;
// ----------------------------------------------------------------------------
-// wxClipboardModule: module responsible for initializing the global clipboard
-// object
-//
-// NB: IMPLEMENT_DYNAMIC_CLASS() for it is in common/appcmn.cpp
+// helpful class for opening the clipboard and automatically closing it
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
-class
wxClipboardModule : public wxModule
+class
WXDLLEXPORT wxClipboardLocker
{
public:
{
public:
- bool OnInit()
- { wxTheClipboard = new wxClipboard; return TRUE; }
- void OnExit()
- { delete wxTheClipboard; wxTheClipboard = (wxClipboard *)NULL; }
+ wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL)
+ {
+ m_clipboard = clipboard ? clipboard : wxTheClipboard;
+ if ( m_clipboard )
+ {
+ m_clipboard->Open();
+ }
+ }
+
+ bool operator!() const { return !m_clipboard->IsOpened(); }
+
+ ~wxClipboardLocker()
+ {
+ if ( m_clipboard )
+ {
+ m_clipboard->Close();
+ }
+ }
private:
private:
- DECLARE_DYNAMIC_CLASS(wxClipboardModule)
+ wxClipboard *m_clipboard;
};
#endif // wxUSE_CLIPBOARD
};
#endif // wxUSE_CLIPBOARD