From: Ryan Pavlik (rpavlik_at_ryand.cjb.net)
Date: Sat Jan 10 2004 - 18:55:26 EST
Hello all! Here is the patch for bug 5143. (Head tree, but patch for
Stable would be nearly identical. I had one for stable, but my editor
"beautified" the code with indents and whatnot, so the diff basically
remade the file... If anyone feels like backporting this, that's cool,
it's only one line and some comments, if not, I'll try getting a fresh
copy from CVS and doing it myself again)
It is a little bit of a hack (prevents the Set button in the tab dialog
from disabling itself) that was neccessitated because I could not find a
"Focus on Control" type method in the code. If there is such a method,
XP or Win32, I can re-write this to be better. If there isn't, there
probably should be one, as there are other dialogs where clicking a
button would execute an action that would disable the button (then we'd
lose focus and keyboard control, again, just as in 5143). If someone
wants to put in a structure for this somewhere, I can probably write the
Win32 implementation of it, given enough time. I just think this ought
to be, since nice dialogs only let you do what's logical.
Anyway, hope the patch helps!
Ryan
? abi/shots/word97/Thumbs.db
? abi/shots/wp/beos/Thumbs.db
? abi/shots/wp/qnx/Thumbs.db
? abi/shots/wp/unix/Thumbs.db
? abi/shots/wp/win/Thumbs.db
? abidistfiles/clipart/Thumbs.db
? expat/config.log
? libiconv/libcharset/include/config.h
? libiconv/libcharset/include/libcharset.h
? nsis/exehead/bitmap1.h
? nsis/exehead/bitmap2.h
? nsis/exehead/exehead.h
? nsis/exehead/icon.h
? nsis/exehead/unicon.h
? popt/config.h
Index: abi/src/wp/ap/xp/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
--- abi/src/wp/ap/xp/ap_Dialog_Tab.cpp 23 Apr 2003 14:37:11 -0000 1.26
+++ abi/src/wp/ap/xp/ap_Dialog_Tab.cpp 9 Jan 2004 02:55:08 -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 : Sat Jan 10 2004 - 19:16:44 EST