Some bytes off, zlib is still 34.5 =/

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1680 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-11-11 19:19:02 +00:00
parent 5f344e49f9
commit 85ee7cbd0a
6 changed files with 57 additions and 59 deletions

View file

@ -521,16 +521,8 @@ nextPage:
else if (g_autoclose) goto nextPage;
mystrcpy(g_tmp,g_caption);
if (this_page->id==NSIS_PAGE_CUSTOM) // custom page
{
process_string_fromtab(
g_tmp+mystrlen(g_tmp),
this_page->caption
);
SetWindowText(hwndDlg,g_tmp);
}
process_string_fromtab(g_tmp+mystrlen(g_tmp),this_page->caption);
SetWindowText(hwndDlg,g_tmp);
#ifdef NSIS_SUPPORT_CODECALLBACKS
if (ExecuteCodeSegment(this_page->prefunc,NULL) || this_page->id<0)
@ -538,13 +530,6 @@ nextPage:
#endif //NSIS_SUPPORT_CODECALLBACKS
if (this_page->id>=0) // NSIS page
{
process_string_fromtab(
g_tmp+mystrlen(g_tmp),
LANG_SUBCAPTION(this_page->id-(g_is_uninstaller?NSIS_PAGE_INSTFILES:0))
);
SetWindowText(hwndDlg,g_tmp);
gDontFookWithFocus = 0;
m_curwnd=CreateDialog(g_hInstance,windows[this_page->id].id,hwndDlg,windows[this_page->id].proc);
if (m_curwnd)

View file

@ -460,14 +460,9 @@ typedef struct
int id; // index in the pages array
#ifdef NSIS_SUPPORT_CODECALLBACKS
int prefunc; // function to use Abort in, or show the custom page if id == NSIS_PAGE_CUSTOM
union
{
int postfunc; // function to do stuff after the page is shown
#endif //NSIS_SUPPORT_CODECALLBACKS
int caption; // caption for custom pages
#ifdef NSIS_SUPPORT_CODECALLBACKS
};
int postfunc; // function to do stuff after the page is shown
#endif //NSIS_SUPPORT_CODECALLBACKS
int caption; // caption tab
int next;
int back;
} page;