X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17e914373a348a6c1f432d06ecab0bced95773ac..06fe46e2ffb5c9d54bab8509c68d2379370cb536:/src/xrc/xh_hyperlink.cpp diff --git a/src/xrc/xh_hyperlink.cpp b/src/xrc/xh_hyperlink.cpp index 21ea787243..b70eb3f1fe 100644 --- a/src/xrc/xh_hyperlink.cpp +++ b/src/xrc/xh_hyperlink.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: hyperlink.cpp +// Name: src/xrc/xh_hyperlink.cpp // Purpose: Hyperlink control // Author: David Norris // Modified by: Ryan Norton, Francesco Montorsi @@ -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" @@ -28,16 +24,19 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_HYPERLINKCTRL + //--------------------------------------------------------------------------- // Includes //--------------------------------------------------------------------------- -#include "wx/hyperlink.h" -#include "wx/utils.h" // wxLaunchDefaultBrowser -#include "wx/xrc/xmlres.h" #include "wx/xrc/xh_hyperlink.h" -#if wxUSE_HYPERLINKCTRL +#ifndef WX_PRECOMP +#endif + +#include "wx/hyperlink.h" +#include "wx/xrc/xmlres.h" //=========================================================================== // Implementation @@ -52,6 +51,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler, wxXmlResourceHandler) wxHyperlinkCtrlXmlHandler::wxHyperlinkCtrlXmlHandler() { + XRC_ADD_STYLE(wxHL_CONTEXTMENU); + XRC_ADD_STYLE(wxHL_ALIGN_LEFT); + XRC_ADD_STYLE(wxHL_ALIGN_RIGHT); + XRC_ADD_STYLE(wxHL_ALIGN_CENTRE); + XRC_ADD_STYLE(wxHL_DEFAULT_STYLE); + AddWindowStyles(); } @@ -59,10 +64,18 @@ wxObject *wxHyperlinkCtrlXmlHandler::DoCreateResource() { XRC_MAKE_INSTANCE(control, wxHyperlinkCtrl) + control->Create + ( + m_parentAsWindow, + GetID(), + GetText(wxT("label")), + GetParamValue(wxT("url")), + GetPosition(), GetSize(), + GetStyle(wxT("style"), wxHL_DEFAULT_STYLE), + GetName() + ); + SetupWindow(control); - control->Create(m_parentAsWindow, GetID(), - GetParamValue(wxT("label")), GetParamValue(wxT("url")), - GetPosition(), GetSize(), GetStyle()); return control; } @@ -72,4 +85,4 @@ bool wxHyperlinkCtrlXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("wxHyperlinkCtrl")); } -#endif // wxUSE_HYPERLINKCTRL +#endif // wxUSE_XRC && wxUSE_HYPERLINKCTRL