From 28583246911da03843797b5090a1eef68b1707a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 29 May 2006 07:23:02 +0000 Subject: [PATCH] Source cleaning for new features. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/xrc/xh_all.h | 2 +- include/wx/xrc/xh_hyperlink.h | 3 +-- src/xrc/xh_hyperlink.cpp | 15 +++++++++------ src/xrc/xmlrsall.cpp | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h index 9a248de5da..9e9f0c3984 100644 --- a/include/wx/xrc/xh_all.h +++ b/include/wx/xrc/xh_all.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_all.h +// Name: wx/xrc/xh_all.h // Purpose: includes all xh_*.h files // Author: Vaclav Slavik // Created: 2000/03/05 diff --git a/include/wx/xrc/xh_hyperlink.h b/include/wx/xrc/xh_hyperlink.h index 6a31109fcb..5e8664db6a 100644 --- a/include/wx/xrc/xh_hyperlink.h +++ b/include/wx/xrc/xh_hyperlink.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_hyperlink.h +// Name: wx/xrc/xh_hyperlink.h // Purpose: Hyperlink control (wxAdv) // Author: David Norris // Modified by: Ryan Norton, Francesco Montorsi @@ -41,4 +41,3 @@ public: #endif // wxUSE_HYPERLINKCTRL #endif // _WX_XH_HYPERLINKH__ - diff --git a/src/xrc/xh_hyperlink.cpp b/src/xrc/xh_hyperlink.cpp index 21ea787243..f4a7424993 100644 --- a/src/xrc/xh_hyperlink.cpp +++ b/src/xrc/xh_hyperlink.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: hyperlink.cpp +// Name: src/xrc/hyperlink.cpp // Purpose: Hyperlink control // Author: David Norris // Modified by: Ryan Norton, Francesco Montorsi @@ -28,16 +28,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 @@ -72,4 +75,4 @@ bool wxHyperlinkCtrlXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("wxHyperlinkCtrl")); } -#endif // wxUSE_HYPERLINKCTRL +#endif // wxUSE_XRC && wxUSE_HYPERLINKCTRL diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp index 3d2aa269bf..eb73722734 100644 --- a/src/xrc/xmlrsall.cpp +++ b/src/xrc/xmlrsall.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xmlrsall.cpp +// Name: src/xrc/xmlrsall.cpp // Purpose: wxXmlResource::InitAllHandlers // Author: Vaclav Slavik // Created: 2000/03/05 -- 2.45.2