Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index 0bc454dc22910c7a7422c98a87cb5e907181dbae..18d1d9d4006fa81809baa0c38b0d50dd34369dcf 100644 (file)
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipboard.h
+// Name:        wx/gtk1/clipbrd.h

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -11,10 +10,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 +22,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 +52,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 +64,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: