Source cleaning for new features.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h
index 9a248de5da55b5679d7e54187d5c830496c3993c..9e9f0c398451c248d5e02f571d01f5b2d7098645 100644 (file)
--- 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
 // 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 6a31109fcb2bbdea63fe067f4df85a0a78cb8a04..5e8664db6a1ccd95e4b073331cd7449df4279873 100644 (file)
--- 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 <danorris@gmail.com>
 // Modified by: Ryan Norton, Francesco Montorsi
 // Purpose:     Hyperlink control (wxAdv)
 // Author:      David Norris <danorris@gmail.com>
 // Modified by: Ryan Norton, Francesco Montorsi


@@ -41,4 +41,3 @@ public:
 
 #endif // wxUSE_HYPERLINKCTRL
 #endif // _WX_XH_HYPERLINKH__
 
 #endif // wxUSE_HYPERLINKCTRL
 #endif // _WX_XH_HYPERLINKH__

-

diff --git a/src/xrc/xh_hyperlink.cpp b/src/xrc/xh_hyperlink.cpp
index 21ea78724337c8dfc36b3533028695f32b14d34b..f4a7424993992986f4b6a4aa1629f562aec73a2a 100644 (file)
--- 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 <danorris@gmail.com>
 // Modified by: Ryan Norton, Francesco Montorsi
 // Purpose:     Hyperlink control
 // Author:      David Norris <danorris@gmail.com>
 // Modified by: Ryan Norton, Francesco Montorsi


@@ -28,16 +28,19 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_HYPERLINKCTRL
+

 //---------------------------------------------------------------------------
 // Includes
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 // Includes
 //---------------------------------------------------------------------------
 

-#include "wx/hyperlink.h"
-#include "wx/utils.h" // wxLaunchDefaultBrowser
-#include "wx/xrc/xmlres.h"

 #include "wx/xrc/xh_hyperlink.h"
 
 #include "wx/xrc/xh_hyperlink.h"
 

-#if wxUSE_HYPERLINKCTRL
+#ifndef WX_PRECOMP
+#endif
+
+#include "wx/hyperlink.h"
+#include "wx/xrc/xmlres.h"

 
 //===========================================================================
 // Implementation
 
 //===========================================================================
 // Implementation


@@ -72,4 +75,4 @@ bool wxHyperlinkCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxHyperlinkCtrl"));
 }
 
     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 3d2aa269bfbcce5004ad7bc015557aa4aeda3c25..eb737227348927d7e0caf32100b6ab29103b558a 100644 (file)
--- 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
 // Purpose:     wxXmlResource::InitAllHandlers
 // Author:      Vaclav Slavik
 // Created:     2000/03/05