Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11306/src/gui

Modified Files:
        wxComposeView.cpp 
Log Message:
really fixed TABbing in the header fields with wx 2.5.2+

Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.366
retrieving revision 1.367
diff -b -u -2 -r1.366 -r1.367
--- wxComposeView.cpp   12 Jul 2004 20:53:20 -0000      1.366
+++ wxComposeView.cpp   15 Jul 2004 22:47:44 -0000      1.367
@@ -1236,12 +1236,14 @@
    if ( event.GetKeyCode() == WXK_TAB )
    {
-      if ( event.ShiftDown() )
+      if ( event.ControlDown() || event.AltDown() )
+         return;
+
+      if ( event.ShiftDown() || !IsModified() )
       {
 #if wxCHECK_VERSION(2, 5, 2)
-         Navigate(0);
+         Navigate(event.ShiftDown() ? 0 : wxNavigationKeyEvent::IsForward);
 #endif // wx 2.5.2+
       }
-      else if ( IsModified() &&
-                  !event.ControlDown() && !event.AltDown() )
+      else
       {
          // mark control as being "not modified" - if the user presses TAB
@@ -1258,23 +1260,9 @@
          {
             m_rcptControl->OnExpand();
-
-            // don't call event.Skip()
-            return;
-         }
-#if wxCHECK_VERSION(2, 5, 2)
-         else
-         {
-            // text is empty, treat the TAB normally
-            Navigate();
          }
-#endif // wx 2.5.2+
       }
-      //else: nothing because we're not interested in Ctrl-TAB, Alt-TAB &c -
-      //      and also in the TABs if the last one was already a TAB
 
-#if wxCHECK_VERSION(2, 5, 2)
-      // skip Skip() below, otherwise a TAB would be inserted in the control
+      // don't call event.Skip()
       return;
-#endif // wx 2.5.2+
    }
 



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to