Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Fix wxURLDataObject comment and documentation for wxGTK

Browse Source 
Fix a copy-and-pasto in the header and also mention that wxURLDataObject
derives from wxDataObjectComposite, and not wxTextDataObject, in wxGTK
too.

Also add a note about the exact base class being an implementation
detail.

Closes https://github.com/wxWidgets/wxWidgets/pull/624
This commit is contained in:
pavelxdd
2017-12-01 15:00:07 +03:00
committed by Vadim Zeitlin
parent 879876e047
commit 504c22a512
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dataobj.h
View File

@@ -549,7 +549,7 @@ private:
// wxURLDataObject defined in msw/ole/dataobj2.h // wxURLDataObject defined in msw/ole/dataobj2.h
#elif defined(__WXGTK20__) #elif defined(__WXGTK20__)
#include "wx/gtk/dataobj2.h" #include "wx/gtk/dataobj2.h"
// wxURLDataObject defined in msw/ole/dataobj2.h // wxURLDataObject defined in gtk/dataobj2.h
#else #else
#if defined(__WXGTK__) #if defined(__WXGTK__)

8
interface/wx/dataobj.h
View File

@@ -630,15 +630,17 @@ public:
wxTheClipboard->SetData(new wxURLDataObject(url)); wxTheClipboard->SetData(new wxURLDataObject(url));
@endcode @endcode
@note This class is derived from wxDataObjectComposite on Windows rather @note The actual base class of this class is not always wxDataObject
than wxTextDataObject on all other platforms. itself, but rather either wxDataObjectComposite in wxMSW and wxGTK or
wxTextDataObject in the other ports. Please don't rely on the exact
base class, it is not guaranteed that it won't change in the future.
@library{wxcore} @library{wxcore}
@category{dnd} @category{dnd}
@see @ref overview_dnd, wxDataObject @see @ref overview_dnd, wxDataObject
*/ */
class wxURLDataObject: public wxTextDataObject class wxURLDataObject: public wxDataObject
{ {
public: public:
/** /**