fix qt tabular alignment tooltip

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@6095 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-02-11 13:16:08 +00:00
parent 2f6126caab
commit b6fafa3bd2
6 changed files with 15 additions and 5 deletions

View File

@ -10,7 +10,7 @@
* software for any purpose. It is provided "as is" without express or * software for any purpose. It is provided "as is" without express or
* implied warranty. * implied warranty.
* *
* $Id: integer_traits.hpp,v 1.19.4.1 2002/09/24 11:38:33 johnmaddock Exp $ * $Id: integer_traits.hpp,v 1.7 2002/10/15 17:51:34 larsbj Exp $
* *
* Idea by Beman Dawes, Ed Brey, Steve Cleary, and Nathan Myers * Idea by Beman Dawes, Ed Brey, Steve Cleary, and Nathan Myers
*/ */
@ -93,7 +93,7 @@ class integer_traits<wchar_t>
#elif defined(__BORLANDC__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__BEOS__) && defined(__GNUC__)) #elif defined(__BORLANDC__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__BEOS__) && defined(__GNUC__))
// No WCHAR_MIN and WCHAR_MAX, whar_t is short and unsigned: // No WCHAR_MIN and WCHAR_MAX, whar_t is short and unsigned:
public detail::integer_traits_base<wchar_t, 0, 0xffff> public detail::integer_traits_base<wchar_t, 0, 0xffff>
#elif (defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400)) || (defined __APPLE__) || (defined(__FreeBSD__) && defined(__GNUC__)) || (defined(__hpux) && defined(__GNUC__) && (__GNUC__ == 3) && !defined(__SGI_STL_PORT)) #elif (defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400)) || (defined __APPLE__) || (defined(__FreeBSD__) && defined(__GNUC__)) || (defined(__OpenBSD__) && defined(__GNUC__)) || (defined(__hpux) && defined(__GNUC__) && (__GNUC__ == 3) && !defined(__SGI_STL_PORT))
// No WCHAR_MIN and WCHAR_MAX, wchar_t has the same range as int. // No WCHAR_MIN and WCHAR_MAX, wchar_t has the same range as int.
// - SGI MIPSpro with native library // - SGI MIPSpro with native library
// - gcc 3.x on HP-UX // - gcc 3.x on HP-UX

View File

@ -125,8 +125,10 @@
// If there isn't good enough wide character support then there will // If there isn't good enough wide character support then there will
// be no wide character regular expressions: // be no wide character regular expressions:
// //
#if (defined(BOOST_NO_CWCHAR) || defined(BOOST_NO_CWCTYPE) || defined(BOOST_NO_STD_WSTRING)) && !defined(BOOST_NO_WREGEX) #if defined(BOOST_NO_CWCHAR) || defined(BOOST_NO_CWCTYPE) || defined(BOOST_NO_STD_WSTRING)
# define BOOST_NO_WREGEX # ifndef BOOST_NO_WREGEX
# define BOOST_NO_WREGEX
# endif
#else #else
# if defined(__sgi) && defined(__SGI_STL_PORT) # if defined(__sgi) && defined(__SGI_STL_PORT)
// STLPort on IRIX is misconfigured: <cwctype> does not compile // STLPort on IRIX is misconfigured: <cwctype> does not compile

View File

@ -56,8 +56,10 @@ inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
{ return s.compare(p); } { return s.compare(p); }
inline int string_compare(const std::string& s, const char* p) inline int string_compare(const std::string& s, const char* p)
{ return std::strcmp(s.c_str(), p); } { return std::strcmp(s.c_str(), p); }
# ifndef BOOST_NO_WREGEX
inline int string_compare(const std::wstring& s, const wchar_t* p) inline int string_compare(const std::wstring& s, const wchar_t* p)
{ return std::wcscmp(s.c_str(), p); } { return std::wcscmp(s.c_str(), p); }
# endif
# define STR_COMP(s,p) string_compare(s,p) # define STR_COMP(s,p) string_compare(s,p)
#endif #endif

View File

@ -1,3 +1,7 @@
2003-02-10 João Luis Meloni Assirati <assirati@fma.if.usp.br>
* ui/QMathMatrixDialogBase.ui: Fix horizontal alignment tooltip
2003-02-07 John Levon <levon@movementarian.org> 2003-02-07 John Levon <levon@movementarian.org>
* lyx_gui.C: delete lyxserver pipes (bug 865) * lyx_gui.C: delete lyxserver pipes (bug 865)

View File

@ -377,7 +377,7 @@
</property> </property>
<property> <property>
<name>toolTip</name> <name>toolTip</name>
<string>Horizontal alignment per column (t,c,b)</string> <string>Horizontal alignment per column (l,c,r)</string>
</property> </property>
</widget> </widget>
<widget row="0" column="1" > <widget row="0" column="1" >

View File

@ -27,6 +27,8 @@ What's new
- new "polski" keymap, useful for entering Polish on a QWERTY keyboard - new "polski" keymap, useful for entering Polish on a QWERTY keyboard
- updated french translation of menus
** Bug fixes ** Bug fixes
- fix bug where opening the tabular dialog would mark the document as - fix bug where opening the tabular dialog would mark the document as