mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 21:23:00 +00:00
- Remove the main() procedure as we already have a WinMain() procedure and we need the hInstance value
- Use RegisterClass with WNDCLASS instead of RegisterClassEx with WNDCLASSEX, so we don't need to care about the small icon svn path=/trunk/; revision=27838
This commit is contained in:
parent
768fc82ee4
commit
308132efa0
1 changed files with 2 additions and 9 deletions
|
@ -34,11 +34,6 @@ void MakePath(TCHAR *szDest, UINT nDestLen, const TCHAR *szExt)
|
||||||
lstrcpy(ptr + 1, szExt);
|
lstrcpy(ptr + 1, szExt);
|
||||||
}
|
}
|
||||||
|
|
||||||
int main ( int argc, char** argv )
|
|
||||||
{
|
|
||||||
return WinMain ( NULL, NULL, NULL, SW_SHOW );
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Main entry point
|
// Main entry point
|
||||||
//
|
//
|
||||||
|
@ -46,7 +41,7 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdSh
|
||||||
{
|
{
|
||||||
HWND hwnd;
|
HWND hwnd;
|
||||||
MSG msg;
|
MSG msg;
|
||||||
WNDCLASSEX wndclass;
|
WNDCLASS wndclass;
|
||||||
INITCOMMONCONTROLSEX ice;
|
INITCOMMONCONTROLSEX ice;
|
||||||
HACCEL hAccelTable;
|
HACCEL hAccelTable;
|
||||||
|
|
||||||
|
@ -60,7 +55,6 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdSh
|
||||||
LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0]));
|
LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0]));
|
||||||
|
|
||||||
//Window class for the main application parent window
|
//Window class for the main application parent window
|
||||||
wndclass.cbSize = sizeof(wndclass);
|
|
||||||
wndclass.style = 0;//CS_HREDRAW | CS_VREDRAW;
|
wndclass.style = 0;//CS_HREDRAW | CS_VREDRAW;
|
||||||
wndclass.lpfnWndProc = WndProc;
|
wndclass.lpfnWndProc = WndProc;
|
||||||
wndclass.cbClsExtra = 0;
|
wndclass.cbClsExtra = 0;
|
||||||
|
@ -71,9 +65,8 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdSh
|
||||||
wndclass.hbrBackground = (HBRUSH)NULL;
|
wndclass.hbrBackground = (HBRUSH)NULL;
|
||||||
wndclass.lpszMenuName = MAKEINTRESOURCE(IDR_MENU1);
|
wndclass.lpszMenuName = MAKEINTRESOURCE(IDR_MENU1);
|
||||||
wndclass.lpszClassName = szAppName;
|
wndclass.lpszClassName = szAppName;
|
||||||
wndclass.hIconSm = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_SOLITAIRE), IMAGE_ICON, 16, 16, 0);
|
|
||||||
|
|
||||||
RegisterClassEx(&wndclass);
|
RegisterClass(&wndclass);
|
||||||
|
|
||||||
ice.dwSize = sizeof(ice);
|
ice.dwSize = sizeof(ice);
|
||||||
ice.dwICC = ICC_BAR_CLASSES;
|
ice.dwICC = ICC_BAR_CLASSES;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue