Fix compilation with MinGW -std=c++11 option.

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

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index e1181ce03f4636a16885d3a0ee9aa1003c85bfd6..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:     wxWidgets licence
+// Licence:     wxWindows licence

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


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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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,54 +24,89 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_CLIPBOARD
+

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

-#include "wx/module.h"

 
 

-#if wxUSE_CLIPBOARD
+#ifndef WX_PRECOMP
+    #include "wx/dataobj.h"
+    #include "wx/module.h"
+#endif

 
 

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

 
 

-class wxClipboardModule : public wxModule
-{
-public:
-    bool OnInit();
-    void OnExit();
+IMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent)

 
 

-private:
-    DECLARE_DYNAMIC_CLASS(wxClipboardModule)
-};
+wxDEFINE_EVENT( wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );

 
 

-// ----------------------------------------------------------------------------
-// global data defined here
-// ----------------------------------------------------------------------------
+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
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
+void wxClipboardEvent::AddFormat(const wxDataFormat& format)
+{
+    m_formats.push_back( format );
+}

 
 

-wxClipboard* wxTheClipboard = (wxClipboard *)NULL;
+// ---------------------------------------------------------
+// wxClipboardBase
+// ---------------------------------------------------------

 
 

-// ----------------------------------------------------------------------------
-// implementation
-// ----------------------------------------------------------------------------
+static wxClipboard *gs_clipboard = NULL;

 
 

-wxClipboardBase::wxClipboardBase()
+/*static*/ wxClipboard *wxClipboardBase::Get()

 {
 {

+    if ( !gs_clipboard )
+    {
+        gs_clipboard = new wxClipboard;
+    }
+    return gs_clipboard;

 }
 
 }
 

-bool wxClipboardModule::OnInit()
+bool wxClipboardBase::IsSupportedAsync( wxEvtHandler *sink )

 {
 {

-    wxTheClipboard = new wxClipboard;
+    // 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 );

 
 

-    return TRUE;
+    sink->QueueEvent( event );
+
+    return true;

 }
 
 }
 

-void wxClipboardModule::OnExit()
+
+// ----------------------------------------------------------------------------
+// wxClipboardModule: module responsible for destroying the global clipboard
+// object
+// ----------------------------------------------------------------------------
+
+class wxClipboardModule : public wxModule

 {
 {

-    delete wxTheClipboard;
+public:
+    bool OnInit() { return true; }
+    void OnExit() { wxDELETE(gs_clipboard); }

 
 

-    wxTheClipboard = (wxClipboard *)NULL;
-}
+private:
+    DECLARE_DYNAMIC_CLASS(wxClipboardModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)

 
 #endif // wxUSE_CLIPBOARD
 
 #endif // wxUSE_CLIPBOARD