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

diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index dc4e2fcac38d8b6f29475cffcfd92afbcb1da789..f696a0ea1aa72926304a9714786c9b3704f41ad6 100644 (file)
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -12,10 +12,6 @@
 #ifndef _WX_HYPERLINK_H__
 #define _WX_HYPERLINK_H__
 
 #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
 #include "wx/defs.h"
 
 #if wxUSE_HYPERLINKCTRL

diff --git a/include/wx/xrc/xh_hyperlink.h b/include/wx/xrc/xh_hyperlink.h
index 5e8664db6a1ccd95e4b073331cd7449df4279873..407f5da223ca70cab6af8b81609dd2d64377be98 100644 (file)
--- 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__
 
 #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
 #include "wx/defs.h"
 
 #if wxUSE_HYPERLINKCTRL

diff --git a/src/generic/hyperlink.cpp b/src/generic/hyperlink.cpp
index d6d2da46cf6c9c1e197616ad41eb571366bf13f9..7b48ede6dcd47e35acbf76fead65d2726b1762d1 100644 (file)
--- a/src/generic/hyperlink.cpp
+++ b/src/generic/hyperlink.cpp
@@ -17,15 +17,11 @@
 // Pre-compiled header stuff
 //---------------------------------------------------------------------------
 
 // 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__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_HYPERLINKCTRL
 #endif
 
 #if wxUSE_HYPERLINKCTRL


@@ -218,12 +214,14 @@ void wxHyperlinkCtrl::OnLeaveWindow(wxMouseEvent& WXUNUSED(event))
 
 void wxHyperlinkCtrl::OnPopUpCopy( wxCommandEvent& 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();
     if (!wxTheClipboard->Open())
         return;
 
     wxTextDataObject *data = new wxTextDataObject( m_url );
     wxTheClipboard->SetData( data );
     wxTheClipboard->Close();

+#endif // wxUSE_CLIPBOARD

 }
 
 #endif // wxUSE_HYPERLINKCTRL
 }
 
 #endif // wxUSE_HYPERLINKCTRL

diff --git a/src/xrc/xh_hyperlink.cpp b/src/xrc/xh_hyperlink.cpp
index f4a7424993992986f4b6a4aa1629f562aec73a2a..a5a0cd3eb8ba8b361a2108bf9d50bb365fd0a98f 100644 (file)
--- a/src/xrc/xh_hyperlink.cpp
+++ b/src/xrc/xh_hyperlink.cpp
@@ -17,10 +17,6 @@
 // Pre-compiled header stuff
 //---------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"