Corrected/added support for column headers with icon and text

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

diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index b6d2583e84144d3ca4a5c30b8916b9d5333cee8e..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__
 

-#ifdef __GNUG__
-#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();


@@ -39,6 +35,9 @@ public:
     // close the clipboard after SetData() and GetData()
     virtual void Close();
 
     // close the clipboard after SetData() and GetData()
     virtual void Close();
 

+    // query whether the clipboard is opened
+    virtual bool IsOpened() const;
+

     // set the clipboard data. all other formats will be deleted.
     virtual bool SetData( wxDataObject *data );
 
     // set the clipboard data. all other formats will be deleted.
     virtual bool SetData( wxDataObject *data );
 


@@ -54,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;


@@ -71,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: