Fix compilation error in recent change to wxSizeEvent generation.

[wxWidgets.git] / src / common / clipcmn.cpp

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index ee7a4018d2c8b2b152d105f6b775f74af1187233..2781a967d797bb1ed9b74a47fe4399e7c983d78b 100644 (file)
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/clipcmn.cpp
+// Name:        src/common/clipcmn.cpp

 // Purpose:     common (to all ports) wxClipboard functions
 // Author:      Robert Roebling
 // Modified by:
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Purpose:     common (to all ports) wxClipboard functions
 // Author:      Robert Roebling
 // Modified by:
 // Created:     28.06.99
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "clipboardbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,37 +24,89 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_CLIPBOARD
+

 #include "wx/clipbrd.h"
 
 #include "wx/clipbrd.h"
 

-//--------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/dataobj.h"
+    #include "wx/module.h"
+#endif
+
+// ---------------------------------------------------------
+// wxClipboardEvent
+// ---------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent)
+
+wxDEFINE_EVENT( wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );
+
+bool wxClipboardEvent::SupportsFormat( const wxDataFormat &format ) const
+{
+#ifdef __WXGTK20__
+    for (wxVector<wxDataFormat>::size_type n = 0; n < m_formats.size(); n++)
+    {
+        if (m_formats[n] == format)
+            return true;
+    }
+
+    return false;
+#else
+    // All other ports just query the clipboard directly
+    // from here
+    wxClipboard* clipboard = (wxClipboard*) GetEventObject();
+    return clipboard->IsSupported( format );
+#endif
+}
+
+void wxClipboardEvent::AddFormat(const wxDataFormat& format)
+{
+    m_formats.push_back( format );
+}
+
+// ---------------------------------------------------------

 // wxClipboardBase
 // wxClipboardBase

-//--------------------------------------------------------------------------
+// ---------------------------------------------------------

 
 

-wxClipboardBase::wxClipboardBase()
+static wxClipboard *gs_clipboard = NULL;
+
+/*static*/ wxClipboard *wxClipboardBase::Get()

 {
 {

+    if ( !gs_clipboard )
+    {
+        gs_clipboard = new wxClipboard;
+    }
+    return gs_clipboard;
+}
+
+bool wxClipboardBase::IsSupportedAsync( wxEvtHandler *sink )
+{
+    // We just imitate an asynchronous API on most platforms.
+    // This method is overridden uner GTK.
+    wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED);
+    event->SetEventObject( this );
+
+    sink->QueueEvent( event );
+
+    return true;

 }
 
 }
 

+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxClipboardModule: module responsible for initializing the global clipboard
+// wxClipboardModule: module responsible for destroying the global clipboard

 // object
 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule
 {
 public:
 // object
 // ----------------------------------------------------------------------------
 
 class wxClipboardModule : public wxModule
 {
 public:

-    wxClipboardModule() { }
-
-    bool OnInit()
-        { wxTheClipboard = new wxClipboard; return TRUE; }
-    void OnExit()
-        { delete wxTheClipboard; wxTheClipboard = (wxClipboard *)NULL; }
+    bool OnInit() { return true; }
+    void OnExit() { wxDELETE(gs_clipboard); }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 

-// ----------------------------------------------------------------------------
-// global data defined here
-// ----------------------------------------------------------------------------
-

 IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
 IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)

+
+#endif // wxUSE_CLIPBOARD