- tooltips for TopToolbar buttons

- replaceStr/replaceStrW moved to mir_core

git-svn-id: http://svn.miranda-ng.org/main/trunk@886 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 10 insertions, 0 deletions

diff --git a/include/m_core.h b/include/m_core.h
index 732e60af2b..43cc67a417 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -369,6 +369,14 @@ MIR_CORE_DLL(int)   wildcmp(char *name, char *mask);
 __forceinline char* lrtrim(char* str) { return ltrim(rtrim(str)); };

 __forceinline char* lrtrimp(char* str) { return ltrimp(rtrim(str)); };

 

+#if defined( __cplusplus )

+	MIR_CORE_DLL(char*) replaceStr( char* &dest, const char *src );

+	MIR_CORE_DLL(WCHAR*) replaceStrW( WCHAR* &dest, const WCHAR *src );

+#else

+	MIR_CORE_DLL(char*) replaceStr( char **dest, const char *src );

+	MIR_CORE_DLL(WCHAR*) replaceStrW( WCHAR **dest, const WCHAR *src );

+#endif

+

 ///////////////////////////////////////////////////////////////////////////////

 // text conversion functions

 

@@ -384,6 +392,7 @@ __forceinline char* lrtrimp(char* str) { return ltrimp(rtrim(str)); };
 	#define mir_u2t_cp(s,c) mir_wstrdup(s)

 

 	#define mir_tstrdup mir_wstrdup

+	#define replaceStrT replaceStrW

 #else

 	#define mir_t2a(s) mir_strdup(s)

 	#define mir_a2t(s) mir_strdup(s)

@@ -396,6 +405,7 @@ __forceinline char* lrtrimp(char* str) { return ltrimp(rtrim(str)); };
 	#define mir_u2t_cp(s,c) mir_u2a_cp(s,c)

 

 	#define mir_tstrdup mir_strdup

+	#define replaceStrT replaceStr

 #endif

 

 MIR_CORE_DLL(WCHAR*) mir_a2u_cp(const char* src, int codepage);