WinCE build fix according to eVC3 and eVC4 SDKs.

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

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index bc4e18fdbe7e28a40561e9820d19cea33c89a68e..f9179fd8a272375aa36226026c77c2afb9889c0e 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 

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

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


@@ -52,7 +48,7 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxDataObject;
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxDataObject;

-class WXDLLEXPORT wxClipboard : public wxObject
+class WXDLLEXPORT wxClipboard : public wxClipboardBase

 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 
 {
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 


@@ -76,7 +72,7 @@ public:
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available

-    virtual bool IsSupported( wxDataFormat format );
+    virtual bool IsSupported( const wxDataFormat& format );

 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data );
 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data );


@@ -90,10 +86,11 @@ public:
     virtual bool Flush();
 
     // X11 has two clipboards which get selected by this call. Empty on MSW.
     virtual bool Flush();
 
     // X11 has two clipboards which get selected by this call. Empty on MSW.

-    void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
+    void UsePrimarySelection( bool WXUNUSED(primary) = false ) { }

 
 private:
     bool m_clearOnExit;
 
 private:
     bool m_clearOnExit;

+    bool m_isOpened;

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