allow passing URL to wxURLDataObject ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -525,6 +525,11 @@ private:
|
|||||||
class WXDLLEXPORT wxURLDataObject : public wxTextDataObject
|
class WXDLLEXPORT wxURLDataObject : public wxTextDataObject
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
wxURLDataObject(const wxString& url = wxEmptyString)
|
||||||
|
: wxTextDataObject(url)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
wxString GetURL() const { return GetText(); }
|
wxString GetURL() const { return GetText(); }
|
||||||
void SetURL(const wxString& url) { SetText(url); }
|
void SetURL(const wxString& url) { SetText(url); }
|
||||||
};
|
};
|
||||||
|
@@ -122,7 +122,8 @@ private:
|
|||||||
class WXDLLEXPORT wxURLDataObject : public wxDataObjectComposite
|
class WXDLLEXPORT wxURLDataObject : public wxDataObjectComposite
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxURLDataObject();
|
// initialize with URL in ctor or use SetURL later
|
||||||
|
wxURLDataObject(const wxString& url = wxEmptyString);
|
||||||
|
|
||||||
// return the URL as string
|
// return the URL as string
|
||||||
wxString GetURL() const;
|
wxString GetURL() const;
|
||||||
|
@@ -1163,7 +1163,7 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
wxURLDataObject::wxURLDataObject()
|
wxURLDataObject::wxURLDataObject(const wxString& url)
|
||||||
{
|
{
|
||||||
// we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same
|
// we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same
|
||||||
// but it seems that some browsers only provide one of them so we have to
|
// but it seems that some browsers only provide one of them so we have to
|
||||||
@@ -1173,6 +1173,9 @@ wxURLDataObject::wxURLDataObject()
|
|||||||
|
|
||||||
// we don't have any data yet
|
// we don't have any data yet
|
||||||
m_dataObjectLast = NULL;
|
m_dataObjectLast = NULL;
|
||||||
|
|
||||||
|
if ( !url.empty() )
|
||||||
|
SetURL(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxURLDataObject::SetData(const wxDataFormat& format,
|
bool wxURLDataObject::SetData(const wxDataFormat& format,
|
||||||
|
Reference in New Issue
Block a user