From 3cb3b8b84de3ff3b660108724139c24b39746449 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 29 May 2006 11:14:34 +0000 Subject: [PATCH] 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 --- include/wx/hyperlink.h | 4 ---- include/wx/xrc/xh_hyperlink.h | 4 ---- src/generic/hyperlink.cpp | 8 +++----- src/xrc/xh_hyperlink.cpp | 4 ---- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h index dc4e2fcac3..f696a0ea1a 100644 --- a/include/wx/hyperlink.h +++ b/include/wx/hyperlink.h @@ -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 diff --git a/include/wx/xrc/xh_hyperlink.h b/include/wx/xrc/xh_hyperlink.h index 5e8664db6a..407f5da223 100644 --- a/include/wx/xrc/xh_hyperlink.h +++ b/include/wx/xrc/xh_hyperlink.h @@ -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 diff --git a/src/generic/hyperlink.cpp b/src/generic/hyperlink.cpp index d6d2da46cf..7b48ede6dc 100644 --- a/src/generic/hyperlink.cpp +++ b/src/generic/hyperlink.cpp @@ -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 diff --git a/src/xrc/xh_hyperlink.cpp b/src/xrc/xh_hyperlink.cpp index f4a7424993..a5a0cd3eb8 100644 --- a/src/xrc/xh_hyperlink.cpp +++ b/src/xrc/xh_hyperlink.cpp @@ -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" -- 2.45.2