Last-minute patch for Stable (5143)

From: Ryan Pavlik (rpavlik_at_ryand.cjb.net)
Date: Mon Jan 12 2004 - 21:52:19 EST

  • Next message: E . A . Zen: "AbiWord Weekly News #178 "The Old Stab and Jiggle" Released."

    I did get CVS to replace my messed up copy with an original, so here's
    my patch for bug 5143 for the stable tree.

    This is cross-platform.

    Thanks!

    Ryan

    Index: ap_Dialog_Tab.cpp
    ===================================================================
    RCS file: /cvsroot/abi/src/wp/ap/xp/ap_Dialog_Tab.cpp,v
    retrieving revision 1.26
    diff -u -r1.26 ap_Dialog_Tab.cpp
    --- ap_Dialog_Tab.cpp 23 Apr 2003 14:37:11 -0000 1.26
    +++ ap_Dialog_Tab.cpp 13 Jan 2004 02:42:38 -0000
    @@ -159,7 +159,9 @@
             _controlEnable( id_ALIGN_BAR, true );
     
             // buttons
    - _controlEnable( id_BUTTON_SET, false );
    + // Un-comment this once changes detailed below in something changed are implemented.
    + //_controlEnable( id_BUTTON_SET, false );
    + _controlEnable( id_BUTTON_SET, true );
             _controlEnable( id_BUTTON_CLEAR, false );
     
             _controlEnable( id_BUTTON_CLEAR_ALL, m_tabInfo.getItemCount() == 0 ? false : true );
    @@ -455,8 +457,11 @@
     
                             // if everything is the same, disable the set
                             if ( pTabInfo->getType() == _gatherAlignment() &&
    - pTabInfo->getLeader() == _gatherLeader() )
    - bEnableSet = false;
    + pTabInfo->getLeader() == _gatherLeader() ){
    + // Disabled to fix bug 5143 and match behavior in the remainder of the program. TODO: Cause focus to shift to OK button here,
    + // and beef up the enable/disable routines for the set button. Then, this can be re-enabled.
    + // bEnableSet = false;
    + }
     
                     }
             }



    This archive was generated by hypermail 2.1.4 : Mon Jan 12 2004 - 22:39:41 EST