From 1560e4ca7a726728f9857696713fd41ba8536234 Mon Sep 17 00:00:00 2001 From: vkos Date: Wed, 21 Oct 2009 15:47:20 +0000 Subject: [PATCH] Replaced meneger with manager, corrected makefile to work on x86-64 git-svn-id: svn://kolibrios.org@1223 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../libGUI/SRC/compilation/cygwin/Makefile | 2 +- .../SRC/{fonts_meneger.h => fonts_manager.h} | 4 +-- .../{fonts_meneger.inc => fonts_manager.inc} | 34 +++++++++---------- ...I_menegement.inc => libGUI_management.inc} | 10 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) rename programs/develop/libraries/libGUI/SRC/{fonts_meneger.h => fonts_manager.h} (96%) rename programs/develop/libraries/libGUI/SRC/{fonts_meneger.inc => fonts_manager.inc} (88%) rename programs/develop/libraries/libGUI/SRC/{libGUI_menegement.inc => libGUI_management.inc} (96%) diff --git a/programs/develop/libraries/libGUI/SRC/compilation/cygwin/Makefile b/programs/develop/libraries/libGUI/SRC/compilation/cygwin/Makefile index d0359c3ca2..ceadb874e8 100644 --- a/programs/develop/libraries/libGUI/SRC/compilation/cygwin/Makefile +++ b/programs/develop/libraries/libGUI/SRC/compilation/cygwin/Makefile @@ -1,6 +1,6 @@ SRC = libGUI.c TARGET = libGUI.obj -CFLAGS = -O2 -nostdinc -nostdlib -march=pentium -fomit-frame-pointer -fno-builtin -fno-builtin-printf +CFLAGS = -O2 -nostdinc -nostdlib -m32 -march=i686 -fomit-frame-pointer -fno-builtin -fno-builtin-printf CC = gcc all: diff --git a/programs/develop/libraries/libGUI/SRC/fonts_meneger.h b/programs/develop/libraries/libGUI/SRC/fonts_manager.h similarity index 96% rename from programs/develop/libraries/libGUI/SRC/fonts_meneger.h rename to programs/develop/libraries/libGUI/SRC/fonts_manager.h index d2fc3ad650..a693c5c6cb 100644 --- a/programs/develop/libraries/libGUI/SRC/fonts_meneger.h +++ b/programs/develop/libraries/libGUI/SRC/fonts_manager.h @@ -1,5 +1,5 @@ /* - font meneger header structure + font manager header structure */ #define FONT_FLAG_DEFAULT_FONT_ON 0x1 @@ -33,7 +33,7 @@ static struct DWORD *fnt_bk; DWORD *default_font; DWORD number_fonts; -}FontsMeneger; +}FontsManager; #pragma pack(pop) #pragma pack(push,1) diff --git a/programs/develop/libraries/libGUI/SRC/fonts_meneger.inc b/programs/develop/libraries/libGUI/SRC/fonts_manager.inc similarity index 88% rename from programs/develop/libraries/libGUI/SRC/fonts_meneger.inc rename to programs/develop/libraries/libGUI/SRC/fonts_manager.inc index b16b2a0234..432f05049a 100644 --- a/programs/develop/libraries/libGUI/SRC/fonts_meneger.inc +++ b/programs/develop/libraries/libGUI/SRC/fonts_manager.inc @@ -1,5 +1,5 @@ /* - menegement of fonts + management of fonts */ //--------------------------------------------------------------------------------- @@ -14,22 +14,22 @@ void DestroyFont(font_t *font) if (font==(font_t*)NULL) return; - if (FontsMeneger.fnt_bk==FontsMeneger.fnt_fd) + if (FontsManager.fnt_bk==FontsManager.fnt_fd) { //parent have got alone font - if (FontsMeneger.fnt_bk==(DWORD*)font) + if (FontsManager.fnt_bk==(DWORD*)font) { #ifdef DEBUG printf("\ndestroyed font %d font name=%s",(int)font,(char*)font->fnt_name); #endif free(font); - FontsMeneger.fnt_bk=(DWORD*)NULL; - FontsMeneger.fnt_fd=(DWORD*)NULL; + FontsManager.fnt_bk=(DWORD*)NULL; + FontsManager.fnt_fd=(DWORD*)NULL; } return; } - seek_font=(font_t*)FontsMeneger.fnt_bk; + seek_font=(font_t*)FontsManager.fnt_bk; while(seek_font!=(font_t*)NULL) { if (seek_font==font) @@ -47,12 +47,12 @@ void DestroyFont(font_t *font) { if (last_font==(font_t*)NULL) {//deliting font is first font of Parend - FontsMeneger.fnt_bk=(DWORD*)next_font; + FontsManager.fnt_bk=(DWORD*)next_font; next_font->fnt_bk=(DWORD*)NULL; if (next_font->fnt_fd==(DWORD*)NULL) { - FontsMeneger.fnt_fd=(DWORD*)next_font; - FontsMeneger.fnt_bk=(DWORD*)next_font; + FontsManager.fnt_fd=(DWORD*)next_font; + FontsManager.fnt_bk=(DWORD*)next_font; } } @@ -60,7 +60,7 @@ void DestroyFont(font_t *font) { //there isn't next fonts last_font->fnt_fd=(DWORD*)NULL; - FontsMeneger.fnt_fd=(DWORD*)last_font; + FontsManager.fnt_fd=(DWORD*)last_font; } } #ifdef DEBUG @@ -81,17 +81,17 @@ void *CreateFont(void) font=malloc(sizeof(struct FONT)); - if (FontsMeneger.fnt_bk==(DWORD*)NULL) + if (FontsManager.fnt_bk==(DWORD*)NULL) {//not yet fonts - FontsMeneger.fnt_bk=(DWORD*)font; - FontsMeneger.fnt_fd=(DWORD*)font; + FontsManager.fnt_bk=(DWORD*)font; + FontsManager.fnt_fd=(DWORD*)font; font->fnt_bk=(DWORD*)NULL; font->fnt_fd=(DWORD*)NULL; } else { - backward_font=(font_t*)FontsMeneger.fnt_fd; - FontsMeneger.fnt_fd=(DWORD*)font; + backward_font=(font_t*)FontsManager.fnt_fd; + FontsManager.fnt_fd=(DWORD*)font; backward_font->fnt_fd=(DWORD*)font; font->fnt_bk=(DWORD*)backward_font; font->fnt_fd=(DWORD*)NULL; @@ -360,13 +360,13 @@ font_t *LoadFont(char *fullfontname) return(NULL); } - FontsMeneger.number_fonts++; + FontsManager.number_fonts++; return(font); } void FreeFont(font_t *font) { - if (font==(font_t*)FontsMeneger.default_font) return; + if (font==(font_t*)FontsManager.default_font) return; free(font->font); DestroyFont(font); diff --git a/programs/develop/libraries/libGUI/SRC/libGUI_menegement.inc b/programs/develop/libraries/libGUI/SRC/libGUI_management.inc similarity index 96% rename from programs/develop/libraries/libGUI/SRC/libGUI_menegement.inc rename to programs/develop/libraries/libGUI/SRC/libGUI_management.inc index be22868a77..47f3717a6d 100644 --- a/programs/develop/libraries/libGUI/SRC/libGUI_menegement.inc +++ b/programs/develop/libraries/libGUI/SRC/libGUI_management.inc @@ -1574,14 +1574,14 @@ char InitLibGUI() //set scan codes input mode for keyboard gui_ksys_set_keyboard_input_mode(1); //------------------------------------------------------------------------------------ - FontsMeneger.fnt_fd=(DWORD*)NULL; - FontsMeneger.fnt_bk=(DWORD*)NULL; - FontsMeneger.number_fonts=0; + FontsManager.fnt_fd=(DWORD*)NULL; + FontsManager.fnt_bk=(DWORD*)NULL; + FontsManager.number_fonts=0; //load default fonts font=LoadFont("CHAR.MT"); if (font==NULL) return (TRUE); - else FontsMeneger.default_font=(DWORD*)font; + else FontsManager.default_font=(DWORD*)font; font->flags=font->flags | FONT_FLAG_DEFAULT_FONT_ON; @@ -1634,7 +1634,7 @@ void QuitLibGUI(parent_t *window) #endif //destroy fonts cash - seek_font=(font_t*)FontsMeneger.fnt_bk; + seek_font=(font_t*)FontsManager.fnt_bk; while(seek_font!=(font_t*)NULL) { exchange_font=(font_t*)seek_font->fnt_fd;