fix header dependancy

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

diff --git a/include/wx/regex.h b/include/wx/regex.h
index 5aa6368e820a27d0178eedf3df7c39c6d2447809..77ed092997277fb793df6661c58e4186d4a852bf 100644 (file)
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -16,7 +16,7 @@
 
 #if wxUSE_REGEX
 
 
 #if wxUSE_REGEX
 

-class WXDLLIMPEXP_FWD_BASE wxString;
+#include "wx/string.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 40dff4df7073d021a788530f5c15462fe759a2db..30dddf3804ae9c38d4bb24aced45cafcef88c9a7 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -27,9 +27,10 @@
 
 #if wxUSE_REGEX
 
 
 #if wxUSE_REGEX
 

+#include "wx/regex.h"
+

 #ifndef WX_PRECOMP
     #include "wx/object.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"

-    #include "wx/string.h"

     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/crt.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/crt.h"


@@ -44,7 +45,6 @@
 #endif
 
 #include <regex.h>
 #endif
 
 #include <regex.h>

-#include "wx/regex.h"

 
 // WXREGEX_USING_BUILTIN    defined when using the built-in regex lib
 // WXREGEX_USING_RE_SEARCH  defined when using re_search in the GNU regex lib
 
 // WXREGEX_USING_BUILTIN    defined when using the built-in regex lib
 // WXREGEX_USING_RE_SEARCH  defined when using re_search in the GNU regex lib