wxMenu::Append (and similar) now return a pointer to the wxMenuItem

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

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 05c8cef304e0542ae6eb46e6175c2094328294d6..7d8b873c1178e0d4fdae5ff587d5c56a95942d70 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "clipbrd.h"
 #endif
 
 #pragma interface "clipbrd.h"
 #endif
 


@@ -66,6 +66,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 );
 


@@ -76,7 +79,7 @@ public:
     virtual bool IsSupported( wxDataFormat format );
 
     // fill data with data on the clipboard (if available)
     virtual bool IsSupported( wxDataFormat format );
 
     // fill data with data on the clipboard (if available)

-    virtual bool GetData( wxDataObject *data );
+    virtual bool GetData( wxDataObject& data );

 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();


@@ -91,6 +94,7 @@ public:
 
 private:
     bool m_clearOnExit;
 
 private:
     bool m_clearOnExit;

+    bool m_isOpened;

 };
 
 #endif // wxUSE_CLIPBOARD
 };
 
 #endif // wxUSE_CLIPBOARD