mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-09 22:07:05 -06:00
4.25 beta
This commit is contained in:
committed by
Kornel Lesiński
parent
47f4915611
commit
af1fe52701
@@ -6,6 +6,8 @@
|
||||
#include "Windows/Window.h"
|
||||
#include "Windows/Defs.h"
|
||||
|
||||
#include <commctrl.h>
|
||||
|
||||
namespace NWindows {
|
||||
namespace NControl {
|
||||
|
||||
|
||||
@@ -9,22 +9,22 @@ extern HINSTANCE g_hInstance;
|
||||
namespace NWindows {
|
||||
namespace NControl {
|
||||
|
||||
BOOL APIENTRY DialogProcedure(HWND dialogHWND, UINT message,
|
||||
static INT_PTR APIENTRY DialogProcedure(HWND dialogHWND, UINT message,
|
||||
WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
CWindow aDialogTmp(dialogHWND);
|
||||
CWindow dialogTmp(dialogHWND);
|
||||
if (message == WM_INITDIALOG)
|
||||
aDialogTmp.SetUserDataLongPtr(lParam);
|
||||
CDialog *aDialog = (CDialog *)(aDialogTmp.GetUserDataLongPtr());
|
||||
if (aDialog == NULL)
|
||||
dialogTmp.SetUserDataLongPtr(lParam);
|
||||
CDialog *dialog = (CDialog *)(dialogTmp.GetUserDataLongPtr());
|
||||
if (dialog == NULL)
|
||||
return FALSE;
|
||||
if (message == WM_INITDIALOG)
|
||||
aDialog->Attach(dialogHWND);
|
||||
dialog->Attach(dialogHWND);
|
||||
|
||||
return BoolToBOOL(aDialog->OnMessage(message, wParam, lParam));
|
||||
return BoolToBOOL(dialog->OnMessage(message, wParam, lParam));
|
||||
}
|
||||
|
||||
bool CDialog::OnMessage(UINT message, UINT wParam, LPARAM lParam)
|
||||
bool CDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (message)
|
||||
{
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
namespace NWindows {
|
||||
namespace NControl {
|
||||
|
||||
BOOL APIENTRY DialogProcedure(HWND dialogHWND, UINT message, UINT wParam, LPARAM lParam);
|
||||
|
||||
class CDialog: public CWindow
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
#include "Windows/Window.h"
|
||||
#include "Windows/Defs.h"
|
||||
|
||||
#include <commctrl.h>
|
||||
|
||||
namespace NWindows {
|
||||
namespace NControl {
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
namespace NWindows {
|
||||
namespace NControl {
|
||||
|
||||
BOOL APIENTRY ProperyPageProcedure(HWND dialogHWND, UINT message,
|
||||
UINT wParam, LONG lParam)
|
||||
INT_PTR APIENTRY ProperyPageProcedure(HWND dialogHWND, UINT message,
|
||||
WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
CDialog tempDialog(dialogHWND);
|
||||
if (message == WM_INITDIALOG)
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
namespace NWindows {
|
||||
namespace NControl {
|
||||
|
||||
BOOL APIENTRY ProperyPageProcedure(HWND dialogHWND, UINT message, UINT wParam, LONG lParam);
|
||||
INT_PTR APIENTRY ProperyPageProcedure(HWND dialogHWND, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
class CPropertyPage: public CDialog
|
||||
{
|
||||
|
||||
9
Windows/Control/StdAfx.h
Executable file
9
Windows/Control/StdAfx.h
Executable file
@@ -0,0 +1,9 @@
|
||||
// StdAfx.h
|
||||
|
||||
#ifndef __STDAFX_H
|
||||
#define __STDAFX_H
|
||||
|
||||
#include "../../Common/MyWindows.h"
|
||||
#include "../../Common/NewHandler.h"
|
||||
|
||||
#endif
|
||||
@@ -18,7 +18,7 @@ static LRESULT CALLBACK WindowProcedure(HWND aHWND, UINT message,
|
||||
LONG_PTR(((LPCREATESTRUCT)lParam)->lpCreateParams));
|
||||
CWindow2 *window = (CWindow2*)(tempWindow.GetUserDataLongPtr());
|
||||
if (window == NULL)
|
||||
return FALSE;
|
||||
return DefWindowProc(aHWND, message, wParam, lParam);
|
||||
if (message == WM_NCCREATE)
|
||||
window->Attach(aHWND);
|
||||
if (window == 0)
|
||||
@@ -55,7 +55,7 @@ bool CWindow2::CreateEx(DWORD exStyle, LPCTSTR className,
|
||||
idOrHMenu, instance, this);
|
||||
}
|
||||
|
||||
LRESULT CWindow2::OnMessage(UINT message, UINT wParam, LPARAM lParam)
|
||||
LRESULT CWindow2::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
LRESULT result;
|
||||
switch (message)
|
||||
|
||||
Reference in New Issue
Block a user