- all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs.

- massive cleanup of the menu-related code

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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/core/miranda.h b/src/core/miranda.h
index 3596dd3e13..f9d6340fb4 100644
--- a/src/core/miranda.h
+++ b/src/core/miranda.h
@@ -11,7 +11,7 @@ modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2

 of the License, or (at your option) any later version.

 

-This program is distributed in the hope that it will be useful,

+This program is distributed in the hope that it will be useful, 

 but WITHOUT ANY WARRANTY; without even the implied warranty of

 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 GNU General Public License for more details.

@@ -21,8 +21,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#define NEWSTR_ALLOCA(A) (A == NULL)?NULL:strcpy((char*)alloca(strlen(A)+1),A)

-#define NEWTSTR_ALLOCA(A) (A == NULL)?NULL:_tcscpy((TCHAR*)alloca((_tcslen(A)+1)* sizeof(TCHAR)),A)

+#define NEWSTR_ALLOCA(A) (A == NULL)?NULL:strcpy((char*)alloca(strlen(A)+1), A)

+#define NEWTSTR_ALLOCA(A) (A == NULL)?NULL:_tcscpy((TCHAR*)alloca((_tcslen(A)+1)* sizeof(TCHAR)), A)

 

 typedef HMONITOR (WINAPI *pfnMyMonitorFromPoint)(POINT, DWORD);

 extern pfnMyMonitorFromPoint MyMonitorFromPoint;

@@ -36,7 +36,7 @@ extern pfnMyMonitorFromWindow MyMonitorFromWindow;
 typedef BOOL(WINAPI *pfnMyGetMonitorInfo) (HMONITOR, LPMONITORINFO);

 extern pfnMyGetMonitorInfo MyGetMonitorInfo;

 

-typedef HRESULT (STDAPICALLTYPE *pfnSHAutoComplete)(HWND,DWORD);

+typedef HRESULT (STDAPICALLTYPE *pfnSHAutoComplete)(HWND, DWORD);

 extern pfnSHAutoComplete shAutoComplete;

 

 typedef HRESULT (STDAPICALLTYPE *pfnSHGetSpecialFolderPathA)(HWND, LPSTR,  int, BOOL );

@@ -142,7 +142,7 @@ char*  mir_u2a( const wchar_t* src);
 /**** miranda.c ************************************************************************/

 

 extern HINSTANCE hMirandaInst;

-extern HANDLE hOkToExitEvent,hModulesLoadedEvent;

+extern HANDLE hOkToExitEvent, hModulesLoadedEvent;

 extern pfnExceptionFilter pMirandaExceptFilter;

 

 /**** modules.c ************************************************************************/