Updated PyCrust from Patrick O'Brien

[wxWidgets.git] / utils / HelpGen / src / wx_extra_imps.cpp

diff --git a/utils/HelpGen/src/wx_extra_imps.cpp b/utils/HelpGen/src/wx_extra_imps.cpp
index 056a522371ecb08a0a16a8436ad3554fdbbaa59a..fcc09b2d79856d91451d11947080c83f650fe33e 100644 (file)
--- a/utils/HelpGen/src/wx_extra_imps.cpp
+++ b/utils/HelpGen/src/wx_extra_imps.cpp
@@ -13,18 +13,6 @@
     #include "wx/defs.h"
 #endif
 
     #include "wx/defs.h"
 #endif
 

-char *
-copystring (const char *s)
-{
-  if (s == NULL) s = "";
-  size_t len = strlen (s) + 1;
-
-  char *news = new char[len];
-  memcpy (news, s, len);    // Should be the fastest
-
-  return news;
-}
-

 #ifdef __WXMSW__
 // from filefn.cpp
 void WXDLLEXPORT wxSplitPath(const char *pszFileName,
 #ifdef __WXMSW__
 // from filefn.cpp
 void WXDLLEXPORT wxSplitPath(const char *pszFileName,


@@ -34,9 +22,9 @@ void WXDLLEXPORT wxSplitPath(const char *pszFileName,
 {
   wxCHECK_RET( pszFileName, _("NULL file name in wxSplitPath") );
 
 {
   wxCHECK_RET( pszFileName, _("NULL file name in wxSplitPath") );
 

-  const char *pDot = strrchr(pszFileName, FILE_SEP_EXT);
-  const char *pSepUnix = strrchr(pszFileName, FILE_SEP_PATH_UNIX);
-  const char *pSepDos = strrchr(pszFileName, FILE_SEP_PATH_DOS);
+  const char *pDot = strrchr(pszFileName, wxFILE_SEP_EXT);
+  const char *pSepUnix = strrchr(pszFileName, wxFILE_SEP_PATH_UNIX);
+  const char *pSepDos = strrchr(pszFileName, wxFILE_SEP_PATH_DOS);

 
   // take the last of the two
   size_t nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
 
   // take the last of the two
   size_t nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;


@@ -73,9 +61,4 @@ const char *wxLocale::GetString(const char *szOrigString,
     return szOrigString;
 }
 
     return szOrigString;
 }
 

-#else // !MSW
-const char *wxGetTranslation(const char *str)
-{
-    return str;
-}
-#endif // MSW
\ No newline at end of file
+#endif // MSW