Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index f8134784e04fcd562e511b8756fdcc7effe563e4..b1089442524d52f7514e85d8665c69dc4273322c 100644 (file)
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     28.06.99
 // Author:      Robert Roebling
 // Modified by:
 // Created:     28.06.99

-// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -39,17 +38,17 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent)
 

-DEFINE_EVENT_TYPE(wxEVT_CLIPBOARD_CHANGED)
+wxDEFINE_EVENT( wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );

 
 bool wxClipboardEvent::SupportsFormat( const wxDataFormat &format ) const
 
 bool wxClipboardEvent::SupportsFormat( const wxDataFormat &format ) const

-{ 
+{

 #ifdef __WXGTK20__
 #ifdef __WXGTK20__

-    // GTK has an asynchronnous API which reports
-    // the supported formats one by one. 
-    // We may have to add X11 and Motif later.
-    wxVector<wxDataFormat>::size_type n;
-    for (n = 0; n < m_formats.size(); n++)
-        { if (m_formats[n] == format) return true; }
+    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
     return false;
 #else
     // All other ports just query the clipboard directly


@@ -57,10 +56,10 @@ bool wxClipboardEvent::SupportsFormat( const wxDataFormat &format ) const
     wxClipboard* clipboard = (wxClipboard*) GetEventObject();
     return clipboard->IsSupported( format );
 #endif
     wxClipboard* clipboard = (wxClipboard*) GetEventObject();
     return clipboard->IsSupported( format );
 #endif

-}     
-        
-void wxClipboardEvent::AddFormat( const wxDataFormat &format ) 
-{ 
+}
+
+void wxClipboardEvent::AddFormat(const wxDataFormat& format)
+{

     m_formats.push_back( format );
 }
 
     m_formats.push_back( format );
 }
 


@@ -85,9 +84,9 @@ bool wxClipboardBase::IsSupportedAsync( wxEvtHandler *sink )
     // This method is overridden uner GTK.
     wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED);
     event->SetEventObject( this );
     // This method is overridden uner GTK.
     wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED);
     event->SetEventObject( this );

-    
+

     sink->QueueEvent( event );
     sink->QueueEvent( event );

-    
+

     return true;
 }
 
     return true;
 }