Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21471
Modified Files:
Console.rc Term.cpp
Log Message:
Minor update of the w32fConsole.dll
Index: Console.rc
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Console.rc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Console.rc 23 Apr 2005 12:42:56 -0000 1.6
--- Console.rc 20 May 2006 08:06:03 -0000 1.7
***************
*** 55,60 ****
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 6,11,0,22
! PRODUCTVERSION 6,11,0,22
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
--- 55,60 ----
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 6,11,0,23
! PRODUCTVERSION 6,11,0,23
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
***************
*** 74,79 ****
VALUE "CompanyName", "Win32Forth developer team\0"
VALUE "FileDescription", "Win32Forth console\0"
! VALUE "FileVersion", "6, 11, 0, 22\0"
! VALUE "InternalName", "CONSOLE\0"
VALUE "LegalCopyright", "\0"
VALUE "LegalTrademarks", "\0"
--- 74,79 ----
VALUE "CompanyName", "Win32Forth developer team\0"
VALUE "FileDescription", "Win32Forth console\0"
! VALUE "FileVersion", "6, 11, 0, 23\0"
! VALUE "InternalName", "W32FCONSOLE\0"
VALUE "LegalCopyright", "\0"
VALUE "LegalTrademarks", "\0"
***************
*** 81,85 ****
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Win32Forth\0"
! VALUE "ProductVersion", "6, 11, 0, 22\0"
VALUE "SpecialBuild", "\0"
END
--- 81,85 ----
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Win32Forth\0"
! VALUE "ProductVersion", "6, 11, 0, 23\0"
VALUE "SpecialBuild", "\0"
END
Index: Term.cpp
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Term.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Term.cpp 23 Apr 2005 12:42:56 -0000 1.6
--- Term.cpp 20 May 2006 08:06:03 -0000 1.7
***************
*** 22,26 ****
HWND hWndMain = NULL; // handle to the main window, initially zero
HWND hWndConsole = NULL; // handle to the console window, initially zero
! HDC hdc = NULL; // the DC of the window
int winsize = 0;
HINSTANCE g_hInstanceDll = NULL;
--- 22,26 ----
HWND hWndMain = NULL; // handle to the main window, initially zero
HWND hWndConsole = NULL; // handle to the console window, initially zero
! HDC hdc = NULL; // the DC of the console window
int winsize = 0;
HINSTANCE g_hInstanceDll = NULL;
***************
*** 919,923 ****
hWndConsole = CreateWindow( ConsoleClassName, // window class name
"", // window caption
! WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_VISIBLE | WS_VSCROLL, // window style
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, // window size
hwnd, // parent window handle
--- 919,923 ----
hWndConsole = CreateWindow( ConsoleClassName, // window class name
"", // window caption
! WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE | WS_VSCROLL, // window style
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, // window size
hwnd, // parent window handle
***************
*** 1042,1047 ****
LRESULT WINAPI ConsoleWndProc( HWND hwnd, UINT message, UINT wParam, LONG lParam )
{
- PAINTSTRUCT ps ;
-
switch( message )
{
--- 1042,1045 ----
***************
*** 1178,1183 ****
case WM_PAINT:
{
hdc = BeginPaint( hwnd, &ps );
! paint();
EndPaint( hwnd, &ps );
return 0;
--- 1176,1183 ----
case WM_PAINT:
{
+ PAINTSTRUCT ps;
hdc = BeginPaint( hwnd, &ps );
! if( hdc )
! paint();
EndPaint( hwnd, &ps );
return 0;
***************
*** 1316,1320 ****
// Register main window class
WNDCLASS wndclass;
! wndclass.style = CS_HREDRAW | CS_VREDRAW;
wndclass.lpfnWndProc = MainWndProc;
wndclass.cbClsExtra = 0;
--- 1316,1320 ----
// Register main window class
WNDCLASS wndclass;
! wndclass.style = 0;
wndclass.lpfnWndProc = MainWndProc;
wndclass.cbClsExtra = 0;
***************
*** 1346,1360 ****
// create console window
! hWndMain = CreateWindow( MainClassName, // window class name
! WindowTitle, // window caption
! WS_OVERLAPPEDWINDOW, // window style
! pos.left, // window x-position
! pos.top, // window y-position
! pos.right - pos.left, // window width
! pos.bottom - pos.top, // window height
! NULL, // parent window handle
! NULL, // window menu handle
! hInstance, // program instance handle
! NULL ); // creation parameters
return (int)hWndMain;
--- 1346,1360 ----
// create console window
! hWndMain = CreateWindow( MainClassName, // window class name
! WindowTitle, // window caption
! WS_OVERLAPPEDWINDOW, // window style
! pos.left, // window x-position
! pos.top, // window y-position
! pos.right - pos.left, // window width
! pos.bottom - pos.top, // window height
! NULL, // parent window handle
! NULL, // window menu handle
! hInstance, // program instance handle
! NULL ); // creation parameters
return (int)hWndMain;
|
