Thread: [wpdev-commits] wolfpack console_win.cpp,1.9,1.10 wolf.dsp,1.231,1.232

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv23740

Modified Files:
	console_win.cpp wolf.dsp 
Log Message:
Reverted that change.

Index: console_win.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** console_win.cpp	13 Sep 2003 15:47:01 -0000	1.9
--- console_win.cpp	13 Sep 2003 18:47:25 -0000	1.10
***************
*** 36,39 ****
--- 36,40 ----
  #define WIN32_LEAN_AND_MEAN
  #include <windows.h>
+ #include <shellapi.h>
  #include <richedit.h>
  #include <qthread.h>
***************
*** 185,197 ****

  					// String contains the link

  					delete [] string;
- 
- 					// Reset selection to the end
  				}				
  			}
  			else if( notify->code == EN_MSGFILTER )
  			{
! 				MSGFILTER *msg = (MSGFILTER*)notify;

  				// Append to the Input Control
--- 186,197 ----

  					// String contains the link
+ 					ShellExecute( mainWindow, "open", string, 0, 0, SW_NORMAL );

  					delete [] string;
  				}				
  			}
  			else if( notify->code == EN_MSGFILTER )
  			{
! 				/*MSGFILTER *msg = (MSGFILTER*)notify;

  				// Append to the Input Control
***************
*** 200,204 ****
  					SendMessage( inputWindow, WM_SETFOCUS, 0, 0 );
  					SendMessage( inputWindow, WM_CHAR, msg->wParam, msg->lParam );
! 				}
  			}
  		}
--- 200,204 ----
  					SendMessage( inputWindow, WM_SETFOCUS, 0, 0 );
  					SendMessage( inputWindow, WM_CHAR, msg->wParam, msg->lParam );
! 				}*/
  			}
  		}
***************
*** 404,408 ****

  	// Check for the caret
! 	PostMessage( logWindow, EM_SETSEL, ctrlLength, ctrlLength );

  	// Delete lines from the beginning if we exceed the maximum limit.
--- 404,408 ----

  	// Check for the caret
! 	SendMessage( logWindow, EM_SETSEL, ctrlLength, ctrlLength );

  	// Delete lines from the beginning if we exceed the maximum limit.
***************
*** 416,425 ****
  			char buffer[1024] = { 0, };
  			((short*)buffer)[0] = 1024;
! 			textcount += PostMessage( logWindow, EM_GETLINE, linecount++, (WPARAM)buffer );
  		}
  		while( textcount < ( ctrlLength + textLength ) - logLimit );

! 		PostMessage( logWindow, EM_SETSEL, 0, textcount );
! 		PostMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)"" );
  	}

--- 416,425 ----
  			char buffer[1024] = { 0, };
  			((short*)buffer)[0] = 1024;
! 			textcount += SendMessage( logWindow, EM_GETLINE, linecount++, (WPARAM)buffer );	// We have to wait here.
  		}
  		while( textcount < ( ctrlLength + textLength ) - logLimit );

! 		SendMessage( logWindow, EM_SETSEL, 0, textcount );
! 		SendMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)"" );
  	}

***************
*** 437,444 ****
  		{
  			CHARRANGE range;
! 			PostMessage( logWindow, EM_EXGETSEL, 0, (LPARAM)&range );
  			range.cpMin -= 1;
! 			PostMessage( logWindow, EM_EXSETSEL, 0, (LPARAM)&range );
! 			PostMessage( logWindow, EM_REPLACESEL, FALSE, 0 );
  			send( sMessage.left( sMessage.length() - 1 ) );
  			return;
--- 437,444 ----
  		{
  			CHARRANGE range;
! 			SendMessage( logWindow, EM_EXGETSEL, 0, (LPARAM)&range );
  			range.cpMin -= 1;
! 			SendMessage( logWindow, EM_EXSETSEL, 0, (LPARAM)&range );
! 			SendMessage( logWindow, EM_REPLACESEL, FALSE, 0 );
  			send( sMessage.left( sMessage.length() - 1 ) );
  			return;
***************
*** 447,458 ****

  	unsigned int tLength = GetWindowTextLength( logWindow );
! 	PostMessage( logWindow, EM_SETSEL, tLength, tLength );

  	// Now it will get right, even if the user had selected sth.
! 	PostMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)sMessage.latin1() );

  	// And ofcourse if not some control is currently capturing the input
  	if( !GetCapture() )
! 		PostMessage( logWindow, WM_VSCROLL, SB_BOTTOM, 0 );
  }

--- 447,458 ----

  	unsigned int tLength = GetWindowTextLength( logWindow );
! 	SendMessage( logWindow, EM_SETSEL, tLength, tLength );

  	// Now it will get right, even if the user had selected sth.
! 	SendMessage( logWindow, EM_REPLACESEL, FALSE, (LPARAM)sMessage.latin1() );

  	// And ofcourse if not some control is currently capturing the input
  	if( !GetCapture() )
! 		SendMessage( logWindow, WM_VSCROLL, SB_BOTTOM, 0 );
  }

***************
*** 488,492 ****
  	};

! 	PostMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
  }

--- 488,492 ----
  	};

! 	SendMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
  }

***************
*** 503,507 ****
  	cf.cbSize = sizeof( CHARFORMAT );

! 	PostMessage( logWindow, EM_GETCHARFORMAT, SCF_SELECTION, (WPARAM)&cf );

  	if( bold )
--- 503,507 ----
  	cf.cbSize = sizeof( CHARFORMAT );

! 	SendMessage( logWindow, EM_GETCHARFORMAT, SCF_SELECTION, (WPARAM)&cf );

  	if( bold )
***************
*** 549,553 ****
  	}

! 	PostMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
  }

--- 549,553 ----
  	}

! 	SendMessage( logWindow, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf );
  }

Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.231
retrieving revision 1.232
diff -C2 -d -r1.231 -r1.232
*** wolf.dsp	13 Sep 2003 15:37:06 -0000	1.231
--- wolf.dsp	13 Sep 2003 18:47:25 -0000	1.232
***************
*** 43,47 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /GR /GX /O2 /Ob1 /I "lib/Python/PC" /I "sqlite" /I "lib/Python/include" /I "lib\ZThread\include" /I "$(QTDIR)\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "QT_DLL" /D "QT_THREAD_SUPPORT" /Fr /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
--- 43,47 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /MD /GR /GX /O2 /I "lib/Python/PC" /I "sqlite" /I "lib/Python/include" /I "lib\ZThread\include" /I "$(QTDIR)\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "QT_DLL" /D "QT_THREAD_SUPPORT" /Fr /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
***************
*** 52,56 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib /nologo /subsystem:windows /map /machine:I386 /out:"..\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
  # SUBTRACT LINK32 /pdb:none

--- 52,56 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib shell32.lib /nologo /subsystem:windows /map /machine:I386 /out:"..\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
  # SUBTRACT LINK32 /pdb:none

***************
*** 77,81 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib /nologo /version:12.9 /subsystem:windows /map /debug /machine:I386 /out:"..\wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
  # SUBTRACT LINK32 /pdb:none

--- 77,81 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib shell32.lib /nologo /version:12.9 /subsystem:windows /map /debug /machine:I386 /out:"..\wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
  # SUBTRACT LINK32 /pdb:none