From 77815b3f9ec5b9bd5733e66b3db35cc47331d444 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 1 May 2020 19:10:48 +0000 Subject: [PATCH] trying to fix build git-svn-id: svn://kolibrios.org@7853 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/TWB/parse_tag.h | 4 +--- programs/cmm/browser/html/help_en.htm | 8 ++++++-- programs/cmm/lib/kfont.h | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/cmm/TWB/parse_tag.h b/programs/cmm/TWB/parse_tag.h index e67347eff0..f328c62b1e 100644 --- a/programs/cmm/TWB/parse_tag.h +++ b/programs/cmm/TWB/parse_tag.h @@ -39,9 +39,7 @@ bool _tag::parse_params() bool result = false; if (!name) return false; if (debug_mode) { - debugln(" "); - debugln(" "); - debug("tag: "); debugln(#name); + debug("\n\ntag: "); debugln(#name); debug("params: "); debugln(#params); debugln(" "); } diff --git a/programs/cmm/browser/html/help_en.htm b/programs/cmm/browser/html/help_en.htm index 5869d9b391..e1b06b7804 100644 --- a/programs/cmm/browser/html/help_en.htm +++ b/programs/cmm/browser/html/help_en.htm @@ -3,10 +3,14 @@ WebView Help -
WebView Help

+
+
+
WebView Text-Based Browser

+
+It is free and open-source. If you have any suggestions or want to help improving it please visit its topic at board.kolibrios.org
 
 Shortcut keys
- 
+
 [CTRL + N or CTRL + T] New window
 [CTRL + R or F5] Refresh the current page
 [CTRL + O] Start OpenDialog to open local file
diff --git a/programs/cmm/lib/kfont.h b/programs/cmm/lib/kfont.h
index 0d9a186847..55e58614e9 100644
--- a/programs/cmm/lib/kfont.h
+++ b/programs/cmm/lib/kfont.h
@@ -62,7 +62,7 @@ int kfont_char_width[255];
 	void ApplySmooth();
 	int WriteIntoWindow();
 	int WriteIntoWindowCenter();
-	void WriteIntoBuffer();
+	dword WriteIntoBuffer();
 	void ShowBuffer();
 	void ShowBufferPart();
 } kfont;
@@ -241,7 +241,7 @@ inline fastcall dword b32(EAX) { return DSDWORD[EAX]; }
 	}
 }
 
-:void KFONT::WriteIntoBuffer(int x,y,w,h; dword _background, _color; byte font_size; dword text1)
+:dword KFONT::WriteIntoBuffer(int x,y,w,h; dword _background, _color; byte font_size; dword text1)
 {
 	dword new_raw_size;
 	if(!text1)return;
@@ -273,7 +273,7 @@ inline fastcall dword b32(EAX) { return DSDWORD[EAX]; }
 		if(bold)x+=math.ceil(size.pt/17);
 		text1++;
 	}
-	return;
+	return x;
 }
 
 :int KFONT::WriteIntoWindow(int x,y; dword _background, _color; byte font_size; dword text1)