From ecea4a776c80e5f531d5e0f0d8edcebc8163f9a3 Mon Sep 17 00:00:00 2001 From: kichik Date: Mon, 11 Nov 2002 16:06:23 +0000 Subject: [PATCH] No more flickering git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1666 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 2 ++ Contrib/StartMenu/StartMenu.c | 2 ++ Plugins/InstallOptions.dll | Bin 11776 -> 11776 bytes Plugins/StartMenu.dll | Bin 5632 -> 5632 bytes Source/exehead/Ui.c | 7 +++++-- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 136ff1d3..1253e379 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -969,6 +969,8 @@ void showCfgDlg() ShowWindow(hConfigWindow, SW_SHOWNA); SetFocus(hNextButton); + LockWindowUpdate(0); + g_done=0; while (!g_done) { diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c index 4926dca0..5e283839 100644 --- a/Contrib/StartMenu/StartMenu.c +++ b/Contrib/StartMenu/StartMenu.c @@ -98,6 +98,8 @@ void __declspec(dllexport) Select(HWND hwndParent, int string_size, char *variab lpWndProcOld = (void *) SetWindowLong(hwndParent, GWL_WNDPROC, (long) ParentWndProc); } + LockWindowUpdate(0); + while (!g_done) { MSG msg; diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 0dd4f6f8b25506992e718e71d709f3b8164bf24d..f45fca3174ecabfef5a892375deaedf5c6306bfd 100644 GIT binary patch delta 1477 zcmc(f{ZE@!6vyu^P@scSSsz{oC;|}#fj;-%vN^_F6f|KVNX9@Riv%!bBaA@{ON^sR zwzwb(Ica;SVtJCZBW8 zJ@=gZoOAm0@iu##N4!nEXKJZ`;}!qE3_C9Pd&B#y{%4`v(q8v>LuWgd{e949lpn(S zO}-G;bseoPBbThL+6qFdXcT$oyKjA$Gw83rdo{5ECn4Q9Uyv`*Y*TH7^qF|11AE`2 zX|YA__JeL5*2qgVmpbG<+E3@S1EwNVuHQjy-a}i+aK&`3J4RRLv0pOlN)Y;Rz-`q% z^9{N(Ex(N1O8t^XZK5+;dX$~gX{nl<=!_gTS3PtF!9($5HN>X7t=n`ZAa9trC^PUL zEzhw(I2qanD`QgI99>GOU+axgO`9eWF*qCNy8SexToLmD=YweyRoRCp)5=?

OM1!8q`PAovlqA+Zru0t-k7MPNI)0gRQ80=BOe z(X2l38FCfH#^HZ3zRq_GckXg*M%U|{nMN`K)7QE)lI!3L!Z)%mZc3_YY5(`^>i+xL zX{qUNn-agFRr_1_HFR{f?eDMeZfkM3%hM0ve-dAsGGid-5<-l(Dq@Wg26WpP9Q+wM zgzN(vNX0%A6llwjM3|R0Mz^``o#N?9yZSQg7?4pzdp zu?kkrcC$UKm36Rg*2i9BgKUWT*a|*h_V4_r%i=ELrU(zn+j*NUeB+XF->llyt55V; zfhiNK%*o=*x|8`!sl^+KO7U^0=4CXi%vF;No0(R4s?(Ux(rCnQ@A^&9g-7DT}a7zYVZ4i1A{U`Z?PR~S@-&A^gEI- zr~yxa7r<-aAQ%8q@F{3UQ$45x3UGrWPywz2OI&z){^9^z^gA(YoyDL|T=)}r#m4c> zM#O6M%6|)ORx^U`#hqE13dC^ZN#9+~M-W@*kK}p&@3Y(V-=3Y3mwi-`m+${0QtW&P zzmTAH0CU)^b%|0InSehDZURpsA1-XZ1gIg}IoI6|j|T6$`LOSPiRVO{|$c%eJwX*&f!(-ex^4!j7}k>_Zk~ zBkUr(!oFma>{n(o8&`QQFXF3tkZw2GbLRq>|i6^F!eF)ZTZ6Y;sYCT@sZf&|h6D+AJ2wh-~#{su!inu-7b diff --git a/Plugins/StartMenu.dll b/Plugins/StartMenu.dll index c068b4678efe3b30530d15099f267d0bc39f6107..d82c2e8e2b665089af5d4d51770805aea2868bf0 100644 GIT binary patch delta 1341 zcmc(f{clrM7{||@>nj_(S$YTBPP@^G*^BnxbI;=joGLzO- zLtJ4mLdq8E@gV?^qyJ7R$N9Qs#-qC;AG5R~~zq~GuPJ=x>A0NE}wm9=l&Q|{F z%h{d#+9EtARkl8L*_da`q^>VI}+#?pEN!^p4I0*fdu{DDY4$;q~L;SpkpGVJN#t6^Pqy(sp@D#aZb%&r! zYp3p?HmON}=D}UuDQ00Ym1C{|j@9y6#!O!s;dUs=A;qsRGfH0#ZV3L?#;9MfQ*`a)cZuACmLr3-UF| yko)9MQm$2MSo3I2+6&r%_O|w(c1oMlGTJZNqGoiJxE!t;m(R7=)$M|B+4NtKG=uN} delta 1337 zcmc(f{clrM7{|}4?Rv}Ju5*RqrtYN^kt)6C<(9D(N7Csu&C*!v)yyZ3InsKQOlw>F;15`iJ~!NLG9Ei@PmoOczsT1)%Xv1lFxb0 z^S#g8y|=ff*YqB2!}F7Y;0U?#!sn6BnSZ!*<|FVw-0q%P0Q>ad@XR9Es%Tfi-uy_Y zVDEmY-;g=zKP%jUPzXEF(0iW-ikHr#iiT2Lf{+4A&5F8dHCPoPq2NxJ*@Vy?;6E#3 zxXI?l;w2lk*MmRVP%GxKf}apy;&nJDu?24`-e6q03ZaPQ4*g49W%NMW^6MC(cT7l$=BMFk z2IP5TtTJVaJ@)>QcF<=sWu1i9NdSB2C_`~i#i6=rS+ah$io-kQt245gAA*BEs$W&Sceqgc+- z17Xky{WxG8fzp__QzxA-KOQi|x6Wp~OOz^WaY!^PM{u8*ReD#;tD_xx$7sh-j){(ZSQc~}g1GL% z17gf|s7gMQIJUTai`Hi_`3}KWEkW%yrOWWvM{b87OE0hqkSpDQ&~actkOk&}VPF6_ z4fFwW>5T~81?&KB0!$zc90yJSv%muI4e$eS1t^0abwD+o5pb~qZ9zlQft9Z>n8LOM zO;qsJznV$WD~AN_3!u2-;!IiX|9uNKG$igTzjW%sip_X^@k5=4X)%mhWD5LOffIoI zP_tsLl8S@4epE0D6ih&vV3J)l~$u&FSb^@M@%iHO=w58DeVJoQ9GwC zX?g8u%|;YbNg7Ej*-AoWJLxBb?s2|hc*XQ)_ Y^@}?4SNQAv&HkW&r+>E}{*)H~1h2DW6951J diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index 86534392..6bdd4d83 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -509,6 +509,8 @@ nextPage: { HWND hwndtmp; + LockWindowUpdate(g_hwnd); + SetDlgItemTextFromLang(hwndDlg,IDOK,this_page->next); hwndtmp=GetDlgItem(hwndDlg,IDC_BACK); @@ -518,9 +520,10 @@ nextPage: if (this_page->id!=NSIS_PAGE_COMPLETED) DestroyWindow(m_curwnd); else if (g_autoclose) goto nextPage; + mystrcpy(g_tmp,g_caption); + if (this_page->id==NSIS_PAGE_CUSTOM) // custom page { - mystrcpy(g_tmp,g_caption); process_string_fromtab( g_tmp+mystrlen(g_tmp), this_page->caption // post_func contains the caption for custom functions @@ -535,7 +538,6 @@ nextPage: #endif //NSIS_SUPPORT_CODECALLBACKS if (this_page->id>=0) // NSIS page { - mystrcpy(g_tmp,g_caption); process_string_fromtab( g_tmp+mystrlen(g_tmp), LANG_SUBCAPTION(this_page->id-(g_is_uninstaller?NSIS_PAGE_INSTFILES:0)) @@ -553,6 +555,7 @@ nextPage: SetWindowPos(m_curwnd,0,r.left,r.top,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER); SendMessage(m_curwnd, WM_NOTIFY_START, 0, 0); ShowWindow(m_curwnd,SW_SHOWNA); + LockWindowUpdate(0); } //XGE 5th September 2002 - Do *not* move the focus to the OK button if we are