From 566463b9330ae7c94587a41b1c3c9a53bece071b Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 7 May 2003 13:08:31 +0000 Subject: [PATCH] Patch level : 2.0 nopatch Files correlati : Ricompilazione Demo : [ ] Commento : Implementata funzione xvt_str_compare_ignoring_case(...) Corretta implementazione della funzione xvt_dwin_scroll(...) git-svn-id: svn://10.65.10.50/trunk@11088 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- xvaga/xvaga.cpp | 50 ++++++------------------------------------------- xvaga/xvt.h | 5 +++-- 2 files changed, 9 insertions(+), 46 deletions(-) diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp index 21c2b59b9..1590b4431 100755 --- a/xvaga/xvaga.cpp +++ b/xvaga/xvaga.cpp @@ -241,44 +241,6 @@ void TwxCaret::Toggle() xvt_dwin_set_draw_ctools(_owner, &dct); } -/////////////////////////////////////////////////////////// -// Dummy application -/////////////////////////////////////////////////////////// -/* -class TMainApp : public wxApp -{ - virtual bool OnInit(); - virtual int OnExit(); - - DECLARE_DYNAMIC_CLASS(TMainApp); -}; - -IMPLEMENT_DYNAMIC_CLASS(TMainApp, wxApp) - -DECLARE_APP(TMainApp) - -// IMPLEMENT_APP_NO_MAIN(TMainApp) -IMPLEMENT_APP(TMainApp) - -extern "C" -{ - int xvt_main(int argc, char** argv); -} - -bool TMainApp::OnInit() -{ - ::wxInitAllImageHandlers(); - - xvt_main(argc, argv); - return FALSE; // Prevents entering the Main Loop -} - -int TMainApp::OnExit() -{ - return wxApp::OnExit(); -} -*/ - /////////////////////////////////////////////////////////// // Generic Display context /////////////////////////////////////////////////////////// @@ -2091,17 +2053,12 @@ void xvt_dwin_scroll_rect(WINDOW win, RCT *rctp, int dh, int dv) if (rctp != NULL) { wxRect rct = NormalizeRCT(rctp); - if (dh > 0) rct.width -= dh; - if (dh < 0) { rct.x -= dh; rct.width += dh; } - if (dv > 0) rct.height -= dv; - if (dv < 0) { rct.y -= dv; rct.height += dv; } if (rct.width > 0 && rct.height > 0) w.ScrollWindow(dh, dv, &rct); - xvt_dwin_invalidate_rect(win, rctp); } else w.ScrollWindow(dh, dv); - // xvt_dwin_update(win); // Seems useless + // xvt_dwin_update(win); // Useless } } @@ -3407,6 +3364,11 @@ SLIST_ELT xvt_slist_get_next(SLIST list, SLIST_ELT item) // XVT Strings??? /////////////////////////////////////////////////////////// +int xvt_str_compare_ignoring_case (const char* s1, const char* s2) +{ + return wxStricmp(s1, s2); +} + char* xvt_str_duplicate(const char* str) { return str ? strdup(str) : NULL; // bleah! diff --git a/xvaga/xvt.h b/xvaga/xvt.h index 68ae6f68a..49f7d48eb 100755 --- a/xvaga/xvt.h +++ b/xvaga/xvt.h @@ -262,8 +262,9 @@ XVTDLL long* xvt_slist_get_data(SLIST_ELT elt); XVTDLL SLIST_ELT xvt_slist_get_first(SLIST list); XVTDLL SLIST_ELT xvt_slist_get_next(SLIST list, SLIST_ELT item); -XVTDLL char* xvt_str_duplicate(const char* str); -XVTDLL BOOLEAN xvt_str_match(const char* str, const char* pat, BOOLEAN case_sensitive); +XVTDLL int xvt_str_compare_ignoring_case (const char* s1, const char* s2); +XVTDLL char* xvt_str_duplicate(const char* str); +XVTDLL BOOLEAN xvt_str_match(const char* str, const char* pat, BOOLEAN case_sensitive); // System calls by XVAGA XVTDLL void xvt_sys_beep(int severity);