4.30 beta

This commit is contained in:
Igor Pavlov
2005-11-18 00:00:00 +00:00
committed by Kornel Lesiński
parent bcd1db2f5a
commit e18587ba51
214 changed files with 5385 additions and 2712 deletions

View File

@@ -27,10 +27,10 @@ CProgressDialog::~CProgressDialog()
{
AddToTitle(TEXT(""));
}
void CProgressDialog::AddToTitle(LPCTSTR s)
void CProgressDialog::AddToTitle(LPCWSTR s)
{
if (MainWindow != 0)
::SetWindowText(MainWindow, s + UString(MainTitle));
::MySetWindowText(MainWindow, UString(s) + MainTitle);
}
#endif

View File

@@ -88,7 +88,7 @@ private:
virtual void OnCancel();
NWindows::NSynchronization::CManualResetEvent _dialogCreatedEvent;
#ifndef _SFX
void AddToTitle(LPCTSTR string);
void AddToTitle(LPCWSTR string);
#endif
bool OnButtonClicked(int buttonID, HWND buttonHWND);
public:
@@ -110,10 +110,10 @@ public:
void WaitCreating() { _dialogCreatedEvent.Lock(); }
INT_PTR Create(const UString &title, HWND aWndParent = 0)
INT_PTR Create(const UString &title, HWND wndParent = 0)
{
_title = title;
return CModalDialog::Create(MAKEINTRESOURCE(IDD_DIALOG_PROGRESS), aWndParent);
return CModalDialog::Create(IDD_DIALOG_PROGRESS, wndParent);
}
static const UINT kCloseMessage;