No more flickering, cross your fingers for no bugs...

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1905 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-12-06 15:43:35 +00:00
parent 00faa19aac
commit 2887407beb
6 changed files with 18 additions and 19 deletions

View file

@ -11,6 +11,7 @@
// For page showing plug-ins
#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd)
#define NOTIFY_BYE_BYE 'x'
typedef struct _stack_t {

View file

@ -175,6 +175,7 @@ int bCancelEnabled = FALSE; // by ORTIM: 13-August-2002
int bCancelShow = FALSE; // by ORTIM: 13-August-2002
FieldType *pFields = NULL;
#define DEFAULT_RECT 1018
int nRectId = 0;
int nNumFields = 0;
int g_done;
@ -462,7 +463,7 @@ bool ReadSettings(void) {
nNumFields = GetPrivateProfileInt("Settings", "NumFields", 0, pszFilename);
nRectId = GetPrivateProfileInt("Settings", "Rect", 1018, pszFilename);
nRectId = GetPrivateProfileInt("Settings", "Rect", DEFAULT_RECT, pszFilename);
bBackEnabled = GetPrivateProfileInt("Settings", "BackEnabled", 0xFFFF0000, pszFilename);
// by ORTIM: 13-August-2002
@ -751,7 +752,7 @@ int createCfgDlg()
}
childwnd=FindWindowEx(hMainWindow,NULL,"#32770",NULL); // find window to replace
if (!childwnd) childwnd=GetDlgItem(hMainWindow,nRectId);
if (!childwnd || nRectId != DEFAULT_RECT) childwnd=GetDlgItem(hMainWindow,nRectId);
if (!childwnd)
{
popstring(NULL);
@ -1003,10 +1004,9 @@ void showCfgDlg()
{
lpWndProcOld = (void *) SetWindowLong(hMainWindow,GWL_WNDPROC,(long)ParentWndProc);
SendMessage(hMainWindow, WM_NOTIFY_CUSTOM_READY, 0, 0);
ShowWindow(hConfigWindow, SW_SHOWNA);
InvalidateRect(hConfigWindow,0,0);
SetFocus(hNextButton);
LockWindowUpdate(0);
g_done=0;

View file

@ -251,10 +251,9 @@ BOOL CALLBACK dlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
AddFolderFromReg(HKEY_LOCAL_MACHINE);
AddFolderFromReg(HKEY_CURRENT_USER);
SendMessage(hwParent, WM_NOTIFY_CUSTOM_READY, 0, 0);
ShowWindow(hwndDlg, SW_SHOWNA);
InvalidateRect(hwndDlg,0,0);
SetFocus(GetDlgItem(hwParent, IDOK));
LockWindowUpdate(0);
}
break;
case WM_COMMAND: