From 7b26d1f946835e34c2f347c191594b60825252ab Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 10 Oct 2013 22:45:19 +0000 Subject: [PATCH] fix for previous revision git-svn-id: svn://kolibrios.org@4005 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/lib/figures.h | 6 +++--- programs/cmm/notify/notify.c | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/cmm/lib/figures.h b/programs/cmm/lib/figures.h index 21cf90bcd5..d3673f4e56 100644 --- a/programs/cmm/lib/figures.h +++ b/programs/cmm/lib/figures.h @@ -1,6 +1,6 @@ //#include "strings.h" -void DrawRectangle(dword x,y,w,h,color1) +:void DrawRectangle(dword x,y,w,h,color1) { if (w<=0) || (h<=0) return; DrawBar(x,y,w,1,color1); @@ -9,7 +9,7 @@ void DrawRectangle(dword x,y,w,h,color1) DrawBar(x+w,y,1,h+1,color1); } -void DrawRectangle3D(dword x,y,w,h,color1,color2) +:void DrawRectangle3D(dword x,y,w,h,color1,color2) { if (w<=0) || (h<=0) return; DrawBar(x,y,w+1,1,color1); @@ -18,7 +18,7 @@ void DrawRectangle3D(dword x,y,w,h,color1,color2) DrawBar(x,y+h,w,1,color2); } -void DrawCaptButton(dword x,y,w,h,id,color_b, color_t,text) +:void DrawCaptButton(dword x,y,w,h,id,color_b, color_t,text) { DefineButton(x,y,w,h,id,color_b); WriteText(-strlen(text)*6+w/2+x+1,h/2-3+y,0x80,color_t,text); diff --git a/programs/cmm/notify/notify.c b/programs/cmm/notify/notify.c index 3f71aed3f5..fd9ccee191 100644 --- a/programs/cmm/notify/notify.c +++ b/programs/cmm/notify/notify.c @@ -19,7 +19,10 @@ int WIN_X, int delay = 400; -#include "lang.h--" +#ifndef AUTOBUILD + #include "lang.h--" +#endif + #ifdef LANG_RUS ?define DEFAULT_TEXT "Эта программа показывает уведомления."; #else