fix github's issue 76

etexteditor · Jan 12, 2011 · 68a1fcd · 68a1fcd
1 parent 1a72db1
commit 68a1fcd
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/src/EditorCtrl.cpp b/src/EditorCtrl.cpp
@@ -76,14 +76,6 @@ static wxString get_modifier_key_env() {
 	return modifiers;
 }
 
-inline bool Isalnum(wxChar c) {
-#ifdef __WXMSW__
-	return ::IsCharAlphaNumeric(c) != 0;
-#else
-	return wxIsalnum(c);
-#endif
-}
-
 // Embedded class: Sort list based on bundle
 class CompareActionBundle : public binary_function<size_t, size_t, bool> {
 public:

diff --git a/src/Strings.cpp b/src/Strings.cpp
@@ -1,5 +1,10 @@
-#include "Strings.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
 #include <wx/tokenzr.h>
+
+#include "Strings.h"
 #include "Utf.h"
 
 #ifdef __WXMSW__

diff --git a/src/Strings.h b/src/Strings.h
@@ -41,5 +41,12 @@ WXDLLIMPEXP_BASE wxArrayString wxSplit(const wxString& str,
                                        const wxChar sep,
                                        const wxChar escape = wxT('\\'));
 
+inline bool Isalnum(wxChar c) {
+#ifdef __WXMSW__
+	return ::IsCharAlphaNumeric(c) != 0;
+#else
+	return wxIsalnum(c);
+#endif
+}
 
 #endif // __STRINGS_H__
diff --git a/src/etests-win/test_hexDigit.cpp b/src/etests-win/test_hexDigit.cpp
@@ -1,4 +1,10 @@
 #include "stdafx.h"
+
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
 #include <limits.h>
 #include "Strings.h"
 #include <gtest/gtest.h>

diff --git a/src/tm_syntaxhandler.cpp b/src/tm_syntaxhandler.cpp
@@ -25,12 +25,11 @@
 #include "Dispatcher.h"
 #include "BundleMenu.h"
 #include "tmStyle.h"
+#include "Strings.h"
 
 #include "IAppPaths.h"
 #include "IEditorDoAction.h"
 
-bool Isalnum(wxChar c); // defined in EditorCtrl.cpp
-
 // tinyxml includes unused vars so it can't compile with Level 4
 #ifdef __WXMSW__
     #pragma warning(push, 1)