simpler define handling

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

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index f8134784e04fcd562e511b8756fdcc7effe563e4..133c18967a10edd0ab8c9524dcfb87a7021896bf 100644 (file)
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -39,17 +39,37 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent)
 

-DEFINE_EVENT_TYPE(wxEVT_CLIPBOARD_CHANGED)
+wxDEFINE_EVENT( wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );
+
+// notice that ctors are defined here and not inline to avoid having to include
+// wx/dataobj.h from wx/clipbrd.h
+wxClipboardEvent::wxClipboardEvent(wxEventType evtType)
+    : wxEvent(0, evtType)
+{
+}
+
+wxClipboardEvent::wxClipboardEvent(const wxClipboardEvent& event)
+    : wxEvent(event),
+      m_formats(event.m_formats)
+{
+}
+
+wxEvent* wxClipboardEvent::Clone() const
+{
+    return new wxClipboardEvent(*this);
+}

 
 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; }
+    // GTK has an asynchronous API which reports the supported formats one by
+    // one. We may have to add X11 and Motif later.
+    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 +77,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 +105,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;
 }