NO_GCC_PRAGMA removed from hyperlink code. Clipboard markup added.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ff7d9066da
commit
3cb3b8b84d
@ -12,10 +12,6 @@
|
||||
#ifndef _WX_HYPERLINK_H__
|
||||
#define _WX_HYPERLINK_H__
|
||||
|
||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||
#pragma interface "hyperlink.h"
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_HYPERLINKCTRL
|
||||
|
@ -12,10 +12,6 @@
|
||||
#ifndef _WX_XH_HYPERLINKH__
|
||||
#define _WX_XH_HYPERLINKH__
|
||||
|
||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||
#pragma interface "hyperlink.h"
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_HYPERLINKCTRL
|
||||
|
@ -17,15 +17,11 @@
|
||||
// Pre-compiled header stuff
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||
#pragma implementation "hyperlink.h"
|
||||
#endif
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#if wxUSE_HYPERLINKCTRL
|
||||
@ -218,12 +214,14 @@ void wxHyperlinkCtrl::OnLeaveWindow(wxMouseEvent& WXUNUSED(event))
|
||||
|
||||
void wxHyperlinkCtrl::OnPopUpCopy( wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
#if wxUSE_CLIPBOARD
|
||||
if (!wxTheClipboard->Open())
|
||||
return;
|
||||
|
||||
wxTextDataObject *data = new wxTextDataObject( m_url );
|
||||
wxTheClipboard->SetData( data );
|
||||
wxTheClipboard->Close();
|
||||
#endif // wxUSE_CLIPBOARD
|
||||
}
|
||||
|
||||
#endif // wxUSE_HYPERLINKCTRL
|
||||
|
@ -17,10 +17,6 @@
|
||||
// Pre-compiled header stuff
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||
#pragma implementation "hyperlink.h"
|
||||
#endif
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user