Added wxPGProperty::SetDefaultValue(v), as a shortcut for SetAttribute(DefaultValue, v)

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

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index d3c90df714f18e1472c10e1cb61324923649adc0..3376472381886c8563c580895232f4fc345e2296 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -62,7 +62,7 @@ public:
 
     // ask if data in correct format is available
     virtual bool IsSupportedAsync( wxEvtHandler *sink );
 
     // ask if data in correct format is available
     virtual bool IsSupportedAsync( wxEvtHandler *sink );

-    
+

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


@@ -105,33 +105,26 @@ public:
 class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent
 {
 public:
 class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent
 {
 public:

-    wxClipboardEvent(wxEventType commandType = wxEVT_NULL)
-        : wxEvent(0,commandType)
-        { }
-
-    wxClipboardEvent(const wxClipboardEvent& event)
-        : wxEvent(event),
-          m_formats(event.m_formats)
-        { }
+    wxClipboardEvent(wxEventType evtType = wxEVT_NULL);
+    wxClipboardEvent(const wxClipboardEvent& event);

 
 

-    bool SupportsFormat( const wxDataFormat &format ) const;
-    void AddFormat( const wxDataFormat &format );
+    bool SupportsFormat(const wxDataFormat& format) const;
+    void AddFormat(const wxDataFormat& format);

 
 

-    virtual wxEvent *Clone() const { return new wxClipboardEvent(*this); }
+    virtual wxEvent *Clone() const;

 
 protected:
     wxVector<wxDataFormat> m_formats;
 
 
 protected:
     wxVector<wxDataFormat> m_formats;
 

-private:

     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent)
 };
 

-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_CLIPBOARD_CHANGED;
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );

 
 typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
 
 #define wxClipboardEventHandler(func) \
 
 typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
 
 #define wxClipboardEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxClipboardEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxClipboardEventFunction, func)

 
 #define EVT_CLIPBOARD_CHANGED(func) wx__DECLARE_EVT0(wxEVT_CLIPBOARD_CHANGED, wxClipboardEventHandler(func))
 
 
 #define EVT_CLIPBOARD_CHANGED(func) wx__DECLARE_EVT0(wxEVT_CLIPBOARD_CHANGED, wxClipboardEventHandler(func))
 


@@ -173,7 +166,7 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
 class WXDLLIMPEXP_CORE wxClipboardLocker
 {
 public:
 class WXDLLIMPEXP_CORE wxClipboardLocker
 {
 public:

-    wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL)
+    wxClipboardLocker(wxClipboard *clipboard = NULL)

     {
         m_clipboard = clipboard ? clipboard : wxTheClipboard;
         if ( m_clipboard )
     {
         m_clipboard = clipboard ? clipboard : wxTheClipboard;
         if ( m_clipboard )


@@ -195,7 +188,7 @@ public:
 private:
     wxClipboard *m_clipboard;
 
 private:
     wxClipboard *m_clipboard;
 

-    DECLARE_NO_COPY_CLASS(wxClipboardLocker)
+    wxDECLARE_NO_COPY_CLASS(wxClipboardLocker);

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