fixing 10.5 only compiles

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

diff --git a/include/wx/mgl/clipbrd.h b/include/wx/mgl/clipbrd.h
index 595f5f43e0ddfcc2c6b7ed026da2370117b62483..307cc8de0bb52c802de69947b72792c175f952c8 100644 (file)
--- a/include/wx/mgl/clipbrd.h
+++ b/include/wx/mgl/clipbrd.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipboard.h
+// Name:        wx/mgl/clipboard.h

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __WX_CLIPBOARD_H__
 #define __WX_CLIPBOARD_H__
 
 #ifndef __WX_CLIPBOARD_H__
 #define __WX_CLIPBOARD_H__
 

-#ifdef __GNUG__
-#pragma interface "clipbrd.h"
-#endif
-

 #if wxUSE_CLIPBOARD
 
 #include "wx/object.h"
 #if wxUSE_CLIPBOARD
 
 #include "wx/object.h"


@@ -31,7 +26,7 @@ class WXDLLEXPORT 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: