added WM_UPDATEUISTATE and related stuff

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

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index a7d010e60d14643fdef172b1002720789d5907bb..7d8b873c1178e0d4fdae5ff587d5c56a95942d70 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipbrd.h
-// Purpose:     Clipboard functionality
+// Name:        wx/msw/clipbrd.h
+// Purpose:     wxClipboad class and clipboard functions for MSW

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -12,13 +12,10 @@
 #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
 

-#include "wx/defs.h"
-#include "wx/setup.h"
-

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


@@ -69,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 );
 


@@ -79,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();


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

-};
-
-// The global clipboard object
-WXDLLEXPORT_DATA(extern wxClipboard*) wxTheClipboard;
-
-//-----------------------------------------------------------------------------
-// wxClipboardModule: module responsible for initializing the global clipboard
-// object
-//-----------------------------------------------------------------------------
-
-class wxClipboardModule : public wxModule
-{
-    DECLARE_DYNAMIC_CLASS(wxClipboardModule)
-
-public:
-    wxClipboardModule() { }
-
-    bool OnInit();
-    void OnExit();
+    bool m_isOpened;

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