cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NO_GCC_PRAGMA removed from hyperlink code. Clipboard markup added.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-05-29 11:14:34 +00:00
parent ff7d9066da
commit 3cb3b8b84d
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/hyperlink.h
View File

@ -12,10 +12,6 @@
#ifndef _WX_HYPERLINK_H__ #ifndef _WX_HYPERLINK_H__
#define _WX_HYPERLINK_H__ #define _WX_HYPERLINK_H__
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "hyperlink.h"
#endif
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_HYPERLINKCTRL #if wxUSE_HYPERLINKCTRL

4
include/wx/xrc/xh_hyperlink.h
View File

@ -12,10 +12,6 @@
#ifndef _WX_XH_HYPERLINKH__ #ifndef _WX_XH_HYPERLINKH__
#define _WX_XH_HYPERLINKH__ #define _WX_XH_HYPERLINKH__
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "hyperlink.h"
#endif
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_HYPERLINKCTRL #if wxUSE_HYPERLINKCTRL

8
src/generic/hyperlink.cpp
View File

@ -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". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_HYPERLINKCTRL #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()) if (!wxTheClipboard->Open())
return; return;
wxTextDataObject *data = new wxTextDataObject( m_url ); wxTextDataObject *data = new wxTextDataObject( m_url );
wxTheClipboard->SetData( data ); wxTheClipboard->SetData( data );
wxTheClipboard->Close(); wxTheClipboard->Close();
#endif // wxUSE_CLIPBOARD
} }
#endif // wxUSE_HYPERLINKCTRL #endif // wxUSE_HYPERLINKCTRL

4
src/xrc/xh_hyperlink.cpp
View File

@ -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". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"