[Sim-icq-commit] sim/sim/ui/qt3 qrichtext.cpp,1.7,1.7.2.1 qtextedit.cpp,1.5.2.1,1.5.2.2

[<sh...@us...>]

Update of /cvsroot/sim-icq/sim/sim/ui/qt3
In directory sc8-pr-cvs1:/tmp/cvs-serv4761/sim/ui/qt3

Modified Files:
      Tag: SHUTOFF
	qrichtext.cpp qtextedit.cpp 
Log Message:
Fix picture tab crash


Index: qrichtext.cpp
===================================================================
RCS file: /cvsroot/sim-icq/sim/sim/ui/qt3/qrichtext.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** qrichtext.cpp	20 Oct 2003 08:39:29 -0000	1.7
--- qrichtext.cpp	31 Oct 2003 15:44:48 -0000	1.7.2.1
***************
*** 2881,2885 ****
                                       bool onlyChanged, bool drawCursor, QTextCursor *cursor, bool resetChanged )
      {
!         if ( withoutDoubleBuffer || par && par->withoutDoubleBuffer ) {
              withoutDoubleBuffer = TRUE;
              QRect r;
--- 2881,2885 ----
                                       bool onlyChanged, bool drawCursor, QTextCursor *cursor, bool resetChanged )
      {
!          if ( withoutDoubleBuffer || par && par->withoutDoubleBuffer ) {
              withoutDoubleBuffer = TRUE;
              QRect r;

Index: qtextedit.cpp
===================================================================
RCS file: /cvsroot/sim-icq/sim/sim/ui/qt3/qtextedit.cpp,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -d -r1.5.2.1 -r1.5.2.2
*** qtextedit.cpp	31 Oct 2003 08:23:05 -0000	1.5.2.1
--- qtextedit.cpp	31 Oct 2003 15:44:48 -0000	1.5.2.2
***************
*** 757,763 ****
  
  bool QTextEdit::event( QEvent *e )
! {
      if ( e->type() == QEvent::AccelOverride && !isReadOnly() ) {
          QKeyEvent* ke = (QKeyEvent*) e;
          if ( ke->state() == NoButton ) {
              if ( ke->key() < Key_Escape ) {
--- 757,764 ----
  
  bool QTextEdit::event( QEvent *e )
! {
      if ( e->type() == QEvent::AccelOverride && !isReadOnly() ) {
          QKeyEvent* ke = (QKeyEvent*) e;
+ 		log(L_DEBUG, "Key %04X", ke->key());
          if ( ke->state() == NoButton ) {
              if ( ke->key() < Key_Escape ) {
***************
*** 943,947 ****
                  } else {
  #ifdef WIN32
! 					if (wndMessage() == WM_KEYDOWN){
  						translate();
  						break;
--- 944,949 ----
                  } else {
  #ifdef WIN32
! 					if ((wndMessage() == WM_KEYDOWN) && 
! 						!(GetAsyncKeyState(VK_LSHIFT) || GetAsyncKeyState(VK_RSHIFT))){
  						translate();
  						break;