libufo-commits Mailing List for UFO: Universal Form Objects (Page 4)
Status: Beta
Brought to you by:
schmidtjf
Menu
▾
▴
libufo-commits — commit messages from cvs
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(8) |
Sep
(78) |
Oct
(69) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Johannes S. <sch...@us...> - 2005-10-11 19:22:29
|
Update of /cvsroot/libufo/ufo-0.5/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22108/src Modified Files: upopupmanager.cpp Log Message: Replaced calls to setOpaque,setOpacity with CSS class ids (transparent). Index: upopupmanager.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/upopupmanager.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** upopupmanager.cpp 13 Feb 2005 16:53:45 -0000 1.7 --- upopupmanager.cpp 11 Oct 2005 19:22:20 -0000 1.8 *************** *** 58,62 **** m_popupWidget->setLayout(new UBorderLayout()); ! m_popupWidget->setOpacity(0.0f); m_popupWidget->add(content); m_popupWidget->setLocation(m_owner->pointToRootPoint(desiredBounds.getLocation())); --- 58,62 ---- m_popupWidget->setLayout(new UBorderLayout()); ! m_popupWidget->setCssClass("transparent"); m_popupWidget->add(content); m_popupWidget->setLocation(m_owner->pointToRootPoint(desiredBounds.getLocation())); |
|
From: Johannes S. <sch...@us...> - 2005-10-11 19:16:51
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20091/include/ufo/gl Modified Files: ugl_graphics.hpp Log Message: Added {set,get}LineWidth to UGraphics. Index: ugl_graphics.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/gl/ugl_graphics.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ugl_graphics.hpp 21 May 2005 15:18:02 -0000 1.5 --- ugl_graphics.hpp 11 Oct 2005 19:16:39 -0000 1.6 *************** *** 91,94 **** --- 91,96 ---- virtual URectangle getClipRect() const; + virtual void setLineWidth(float width); + virtual float getLineWidth() const; virtual void translate(float x, float y); |
|
From: Johannes S. <sch...@us...> - 2005-10-11 19:16:27
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19959/include/ufo Modified Files: ugraphics.hpp Log Message: Added {set,get}LineWidth to UGraphics. Index: ugraphics.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/ugraphics.hpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ugraphics.hpp 16 Jul 2005 13:44:59 -0000 1.12 --- ugraphics.hpp 11 Oct 2005 19:16:13 -0000 1.13 *************** *** 167,170 **** --- 167,172 ---- virtual URectangle getClipRect() const = 0; + virtual void setLineWidth(float width) = 0; + virtual float getLineWidth() const = 0; public: // /** Translates the coordinate system by the given x and y values. */ |
|
From: Johannes S. <sch...@us...> - 2005-10-11 19:16:23
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19959/include/ufo/gl Modified Files: ugl_prototypes.hpp Log Message: Added {set,get}LineWidth to UGraphics. Index: ugl_prototypes.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/gl/ugl_prototypes.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ugl_prototypes.hpp 15 Sep 2005 16:34:44 -0000 1.8 --- ugl_prototypes.hpp 11 Oct 2005 19:16:13 -0000 1.9 *************** *** 134,138 **** UFO_GL_PROC(GLuint,glGenLists,(GLsizei range)) UFO_GL_PROC(void,glGenTextures,(GLsizei n, GLuint *textures)) ! UFO_GL_PROC_UNUSED(void,glGetBooleanv,(GLenum pname, GLboolean *params)) UFO_GL_PROC_UNUSED(void,glGetClipPlane,(GLenum plane, GLdouble *equation)) UFO_GL_PROC_UNUSED(void,glGetDoublev,(GLenum pname, GLdouble *params)) --- 134,138 ---- UFO_GL_PROC(GLuint,glGenLists,(GLsizei range)) UFO_GL_PROC(void,glGenTextures,(GLsizei n, GLuint *textures)) ! UFO_GL_PROC(void,glGetBooleanv,(GLenum pname, GLboolean *params)) UFO_GL_PROC_UNUSED(void,glGetClipPlane,(GLenum plane, GLdouble *equation)) UFO_GL_PROC_UNUSED(void,glGetDoublev,(GLenum pname, GLdouble *params)) |
|
From: Johannes S. <sch...@us...> - 2005-10-11 14:30:55
|
Update of /cvsroot/libufo/ufo-0.5/src/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5564/src/ui Modified Files: ucss.cpp Log Message: Fixed valgrind warning about possible unconditional jump. Index: ucss.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ui/ucss.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ucss.cpp 2 Sep 2005 14:26:13 -0000 1.5 --- ucss.cpp 11 Oct 2005 14:31:03 -0000 1.6 *************** *** 84,89 **** bool ufo_css_eatComment(std::istream & stream) { ! char comment1; ! char comment2; bool comment_eaten = false; --- 84,89 ---- bool ufo_css_eatComment(std::istream & stream) { ! char comment1 = 0; ! char comment2 = 0; bool comment_eaten = false; |
|
From: Johannes S. <sch...@us...> - 2005-10-11 14:22:39
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3115/include/ufo Modified Files: uversioninfo.hpp Log Message: Bumped version info to 0.8.3 Index: uversioninfo.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/uversioninfo.hpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** uversioninfo.hpp 30 Sep 2005 14:01:25 -0000 1.11 --- uversioninfo.hpp 11 Oct 2005 14:22:46 -0000 1.12 *************** *** 38,42 **** #define UFO_MAJOR_VERSION 0 #define UFO_MINOR_VERSION 8 ! #define UFO_MICRO_VERSION 2 namespace ufo { --- 38,42 ---- #define UFO_MAJOR_VERSION 0 #define UFO_MINOR_VERSION 8 ! #define UFO_MICRO_VERSION 3 namespace ufo { |
|
From: Johannes S. <sch...@us...> - 2005-10-11 14:22:39
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3115 Modified Files: README configure.ac Log Message: Bumped version info to 0.8.3 Index: README =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/README,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** README 30 Sep 2005 14:01:25 -0000 1.8 --- README 11 Oct 2005 14:22:45 -0000 1.9 *************** *** 5,9 **** (UFO) ! Version 0.8.2 --- --- 5,9 ---- (UFO) ! Version 0.8.3 --- Index: configure.ac =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/configure.ac,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** configure.ac 30 Sep 2005 12:36:17 -0000 1.33 --- configure.ac 11 Oct 2005 14:22:45 -0000 1.34 *************** *** 21,25 **** UFO_MAJOR_VERSION=0 UFO_MINOR_VERSION=8 ! UFO_MICRO_VERSION=2 UFO_INTERFACE_AGE=0 UFO_BINARY_AGE=0 --- 21,25 ---- UFO_MAJOR_VERSION=0 UFO_MINOR_VERSION=8 ! UFO_MICRO_VERSION=3 UFO_INTERFACE_AGE=0 UFO_BINARY_AGE=0 |
|
From: Johannes S. <sch...@us...> - 2005-09-30 14:30:26
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29580/include/ufo Modified Files: ucollectable.hpp Log Message: Explicitly inlined all inline methods (to mollify MinGw about dllimport linkage warnings). Index: ucollectable.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/ucollectable.hpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ucollectable.hpp 30 Sep 2005 12:36:26 -0000 1.11 --- ucollectable.hpp 30 Sep 2005 14:30:08 -0000 1.12 *************** *** 69,73 **** // hm, evil void * operator new(std::size_t size); ! void operator delete(void * p, std::size_t /* size */); private: mutable unsigned int m_refCount : 31; --- 69,73 ---- // hm, evil void * operator new(std::size_t size); ! inline void operator delete(void * p, std::size_t /* size */); private: mutable unsigned int m_refCount : 31; |
|
From: Johannes S. <sch...@us...> - 2005-09-30 14:30:17
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29580/include/ufo/util Modified Files: ustring.hpp Log Message: Explicitly inlined all inline methods (to mollify MinGw about dllimport linkage warnings). Index: ustring.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/util/ustring.hpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ustring.hpp 5 Jul 2005 12:06:03 -0000 1.15 --- ustring.hpp 30 Sep 2005 14:30:08 -0000 1.16 *************** *** 59,66 **** public: // operators ! bool operator ==(UString & str) const; ! bool operator ==(const UString & str) const; ! bool operator ==(const std::string & str) const; UString & operator =(char * str); --- 59,66 ---- public: // operators ! inline bool operator ==(UString & str) const; ! inline bool operator ==(const UString & str) const; ! inline bool operator ==(const std::string & str) const; UString & operator =(char * str); *************** *** 77,81 **** * objet gets out of scope. */ ! const std::string & str() const; /** Returns a reference to the internal string. * Be careful, this changes the internal string for all UString objects --- 77,81 ---- * objet gets out of scope. */ ! inline const std::string & str() const; /** Returns a reference to the internal string. * Be careful, this changes the internal string for all UString objects *************** *** 86,93 **** * @see detach */ ! std::string & str(); /** Returns a const char pointer to the shared string object. */ ! const char * c_str() const; /** Creates a local copy of the shared string. */ --- 86,93 ---- * @see detach */ ! inline std::string & str(); /** Returns a const char pointer to the shared string object. */ ! inline const char * c_str() const; /** Creates a local copy of the shared string. */ |
|
From: Johannes S. <sch...@us...> - 2005-09-30 14:05:43
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23705 Modified Files: INSTALL Log Message: Index: INSTALL =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** INSTALL 30 Sep 2005 14:01:51 -0000 1.2 --- INSTALL 30 Sep 2005 14:05:35 -0000 1.3 *************** *** 62,66 **** http://www.gimp.org/~tml/gimp/win32/downloads.html ! You'll need "libiconv", "gettext-runtime", "glib" and "pkgconfig". --- 62,67 ---- http://www.gimp.org/~tml/gimp/win32/downloads.html ! Download "libiconv", "gettext-runtime", "glib" and "pkgconfig" ! and unpack them into your mingw directory. |
|
From: Johannes S. <sch...@us...> - 2005-09-30 14:02:04
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22839 Modified Files: INSTALL Log Message: Added some rough installation guidelines. Index: INSTALL =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/INSTALL,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** INSTALL 23 Aug 2002 17:44:37 -0000 1.1.1.1 --- INSTALL 30 Sep 2005 14:01:51 -0000 1.2 *************** *** 1,2 **** --- 1,70 ---- + ==== LibUFO installation ==== + + Program requirements: + * OpenGL/Mesa3D libraries + + Where to obtain the above: + * Mesa3D http://sourceforge.net/projects/mesa3d + (Most people have already a OpenGL installed) + + + Installation procedure (Unix) + ============================= + + 1. Run 'configure' with any desired options. (If you are unfamiliar with + Autoconf scripts, see the "Basic Installation" section below) + + 2. Run 'make'. + + 3. Run 'make install' to install the program. + + + Installation procedure (Win32) + ============================= + + a) Using MS VC++ 6 + ------------------ + Please look into the msvc subdirectory and read Readme-vc6.txt + + b) Using free software (MinGW) + ------------------------------ + 1. Download from the following site: + http://www.mingw.org/download.html + + MinGW-4.1.0.exe (or newer) + MSYS-1.0.10.exe (or newer) + msysDTTK-1.0.1.exe (or newer) + + and run them. + + You should have now a working MinGW system. + + 2. Open a MSys console (usually c:\msys\1.0\msys.bat). + Switch to the directory where your ufo tar.gz file is. + Decompress via + tar -xvzf ufo-version.tar.gz + + change to the newly created directory. + + 3. You can now procede with the common Unix way: + Run 'configure' + Run 'make' + Run 'make install' + + (If configure fails with warnings that your compiler can't produce + correct binaries, you might have to adjust the path and add mingw, e.g. via + 'export PATH=/c/mingw/bin:$PATH') + + 4. To compile the examples using the configure script, you will + need pkg-config. + + Tor Lillqvist provides some binaries at + http://www.gimp.org/~tml/gimp/win32/downloads.html + + You'll need "libiconv", "gettext-runtime", "glib" and "pkgconfig". + + + + Basic Installation ================== |
|
From: Johannes S. <sch...@us...> - 2005-09-30 14:01:49
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22697/include/ufo Modified Files: uversioninfo.hpp Log Message: Bumped version info to 0.8.2 Index: uversioninfo.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/uversioninfo.hpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** uversioninfo.hpp 4 Sep 2005 13:14:59 -0000 1.10 --- uversioninfo.hpp 30 Sep 2005 14:01:25 -0000 1.11 *************** *** 38,42 **** #define UFO_MAJOR_VERSION 0 #define UFO_MINOR_VERSION 8 ! #define UFO_MICRO_VERSION 1 namespace ufo { --- 38,42 ---- #define UFO_MAJOR_VERSION 0 #define UFO_MINOR_VERSION 8 ! #define UFO_MICRO_VERSION 2 namespace ufo { |
|
From: Johannes S. <sch...@us...> - 2005-09-30 14:01:49
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22697 Modified Files: README Log Message: Bumped version info to 0.8.2 Index: README =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/README,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** README 16 Sep 2005 12:59:52 -0000 1.7 --- README 30 Sep 2005 14:01:25 -0000 1.8 *************** *** 5,9 **** (UFO) ! Version 0.8.1 --- --- 5,9 ---- (UFO) ! Version 0.8.2 --- |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:57:46
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8364/include/ufo Modified Files: ufo_debug.hpp Log Message: Index: ufo_debug.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/ufo_debug.hpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ufo_debug.hpp 30 Sep 2005 12:36:26 -0000 1.11 --- ufo_debug.hpp 30 Sep 2005 12:57:33 -0000 1.12 *************** *** 80,84 **** #else UDebugStream & ! operator<<(ostream_type & (*/* pf */)(ostream_type &)) { return *this; } --- 80,84 ---- #else UDebugStream & ! operator<<(ostream_type & (* /* pf */)(ostream_type &)) { return *this; } |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:42:34
|
Update of /cvsroot/libufo/ufo-0.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5327 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/ChangeLog,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ChangeLog 15 Sep 2005 10:26:57 -0000 1.35 --- ChangeLog 30 Sep 2005 12:42:20 -0000 1.36 *************** *** 886,887 **** --- 886,894 ---- - Added support for keyboard events to UListBox - New default layout manager for any new widget is now UBoxLayout + + 0.8.2 + - Fixed compilation on gcc <= 3.2 (be careful with static template members) + - Mollified MinGw compiler about dllimport linkage + - Readded check for _MSC_VER in ufo_config.hpp for WIN32 target + (might break DevCpp?) + - Fixed several warnings |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:42:16
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5307/include/ufo/config Modified Files: ufo_config_msvc.hpp Log Message: Added pragma description. Index: ufo_config_msvc.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/config/ufo_config_msvc.hpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ufo_config_msvc.hpp 13 Feb 2005 17:49:24 -0000 1.11 --- ufo_config_msvc.hpp 30 Sep 2005 12:42:08 -0000 1.12 *************** *** 30,36 **** // disable win32 warnings on exporting STL objects ! #pragma warning(disable: 4231) #pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data ! #pragma warning(disable: 4251) #pragma warning(disable: 4275) // non - DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier' --- 30,36 ---- // disable win32 warnings on exporting STL objects ! #pragma warning(disable: 4231) // nonstandard extension used : 'extern' before template explicit instantiation #pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data ! #pragma warning(disable: 4251) // class 'A' needs to have dll interface for to be used by clients of class 'B'. #pragma warning(disable: 4275) // non - DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier' |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:41:49
|
Update of /cvsroot/libufo/ufo-0.5/include/ufo/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5251/include/ufo/config Modified Files: ufo_config.hpp Log Message: Readded check for _MSC_VER in ufo_config.hpp for WIN32 target (might break DevCpp?) Index: ufo_config.hpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/include/ufo/config/ufo_config.hpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ufo_config.hpp 5 Jul 2005 11:26:20 -0000 1.15 --- ufo_config.hpp 30 Sep 2005 12:41:40 -0000 1.16 *************** *** 36,41 **** // this is our auto configured config header #include "ufo_config_gnu.hpp" ! #elif defined(WIN32) ! //&& defined(_MSC_VER) // use msvc header for win 32 targets without configure #include "ufo_config_msvc.hpp" --- 36,40 ---- // this is our auto configured config header #include "ufo_config_gnu.hpp" ! #elif defined(WIN32) && defined(_MSC_VER) // use msvc header for win 32 targets without configure #include "ufo_config_msvc.hpp" |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:38:04
|
Update of /cvsroot/libufo/ufo-0.5/src/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4407/src/widgets Modified Files: uwidget.cpp Log Message: Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about wrong initialization order. Index: uwidget.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/uwidget.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** uwidget.cpp 16 Sep 2005 12:40:08 -0000 1.48 --- uwidget.cpp 30 Sep 2005 12:37:56 -0000 1.49 *************** *** 89,92 **** --- 89,93 ---- , m_isInValidHierarchy(false) , m_hasInvalidLayout(false) + , m_styleHintsDetached(false) , m_eventState(0xffffffff)//MouseEvents | MouseMotionEvents) // FIXME , m_parent(NULL) *************** *** 98,102 **** , m_style(NULL) , m_styleHints(NULL) - , m_styleHintsDetached(false) , m_bounds() , m_clipBounds(URectangle::invalid) --- 99,102 ---- *************** *** 126,129 **** --- 126,130 ---- , m_isInValidHierarchy(false) , m_hasInvalidLayout(false) + , m_styleHintsDetached(false) , m_eventState(0xffffffff)//MouseEvents | MouseMotionEvents) // FIXME , m_parent(NULL) *************** *** 135,139 **** , m_style(NULL) , m_styleHints(NULL) - , m_styleHintsDetached(false) , m_bounds() , m_clipBounds(URectangle::invalid) --- 136,139 ---- *************** *** 1413,1418 **** m_children.insert(m_children.begin() + index, w); } ! int min_pos = std::min(index, old_pos); ! for (int i = min_pos; i < m_children.size(); ++i) { getWidget(i)->processWidgetEvent( new UWidgetEvent(getWidget(i), UEvent::WidgetZOrderChanged) --- 1413,1418 ---- m_children.insert(m_children.begin() + index, w); } ! unsigned int min_pos = std::min(index, old_pos); ! for (unsigned int i = min_pos; i < m_children.size(); ++i) { getWidget(i)->processWidgetEvent( new UWidgetEvent(getWidget(i), UEvent::WidgetZOrderChanged) *************** *** 1782,1786 **** static std::list<std::pair<UKeyStroke, UWidget*> > ufo_s_shortcuts; ! static int ufo_s_oldIndex = 0; static UKeyStroke ufo_s_oldStroke; --- 1782,1786 ---- static std::list<std::pair<UKeyStroke, UWidget*> > ufo_s_shortcuts; ! static unsigned int ufo_s_oldIndex = 0; static UKeyStroke ufo_s_oldStroke; |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:37:57
|
Update of /cvsroot/libufo/ufo-0.5/src/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4366/src/xml Modified Files: uxul.cpp Log Message: Fixed warnings about unused variables. Index: uxul.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/xml/uxul.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** uxul.cpp 15 Sep 2005 10:15:23 -0000 1.7 --- uxul.cpp 30 Sep 2005 12:37:44 -0000 1.8 *************** *** 276,280 **** std::string value = UString(menuElement->Value()).lowerCase(); if ("menuitem" == value) { ! UMenuItem * item; if (menuElement->Attribute("type")) { std::string type(menuElement->Attribute("type")); --- 276,280 ---- std::string value = UString(menuElement->Value()).lowerCase(); if ("menuitem" == value) { ! UMenuItem * item = NULL; if (menuElement->Attribute("type")) { std::string type(menuElement->Attribute("type")); *************** *** 541,545 **** TiXmlNode* node = 0; TiXmlElement* windowElement = 0; - TiXmlElement* widgetElement = 0; node = m_doc->FirstChild(); --- 541,544 ---- |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:37:44
|
Update of /cvsroot/libufo/ufo-0.5/src/ux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4311/src/ux Modified Files: uxglxdriver.cpp Log Message: Fixed warning about doulbe initialization. Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about unused variables. Index: uxglxdriver.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ux/uxglxdriver.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** uxglxdriver.cpp 21 Jun 2005 09:28:06 -0000 1.8 --- uxglxdriver.cpp 30 Sep 2005 12:37:36 -0000 1.9 *************** *** 648,652 **** int visFrames = 0; std::vector<UXFrame*> frames = m_display->getFrames(); ! for (int i = 0; i < frames.size(); ++i) { if (frames[i]->isVisible()) { visFrames++; --- 648,652 ---- int visFrames = 0; std::vector<UXFrame*> frames = m_display->getFrames(); ! for (unsigned int i = 0; i < frames.size(); ++i) { if (frames[i]->isVisible()) { visFrames++; *************** *** 697,701 **** } virtual bool isAvailable() { ! Display *display = display = XOpenDisplay(NULL); if (display != NULL) { XCloseDisplay(display); --- 697,701 ---- } virtual bool isAvailable() { ! Display * display = XOpenDisplay(NULL); if (display != NULL) { XCloseDisplay(display); *************** *** 861,865 **** XSetWindowAttributes winAttr; ! XSizeHints sizeHints; uint32_t mask; --- 861,865 ---- XSetWindowAttributes winAttr; ! //XSizeHints sizeHints; uint32_t mask; *************** *** 933,936 **** --- 933,937 ---- //XMapRaised(m_glxDriver->getX11Display(), m_window); + return true; } |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:37:32
|
Update of /cvsroot/libufo/ufo-0.5/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4188/src Modified Files: umenumanager.cpp uvalidator.cpp uvertexarray.cpp Log Message: Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about unhandled switch values. Fixed warnings about unused variables. Index: umenumanager.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/umenumanager.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** umenumanager.cpp 17 Aug 2005 09:57:56 -0000 1.15 --- umenumanager.cpp 30 Sep 2005 12:37:20 -0000 1.16 *************** *** 149,152 **** --- 149,154 ---- clearPath(); break; + default: + break; } } *************** *** 210,213 **** --- 212,217 ---- e->consume(); break; + default: + break; } } *************** *** 294,298 **** // parent menus of item std::vector<UMenu*> parents; ! UMenu * menu = dynamic_cast<UMenu*>(item); UMenu * temp = dynamic_cast<UMenu*>(item->getParentMenu()); --- 298,302 ---- // parent menus of item std::vector<UMenu*> parents; ! //UMenu * menu = dynamic_cast<UMenu*>(item); UMenu * temp = dynamic_cast<UMenu*>(item->getParentMenu()); *************** *** 359,364 **** return; } ! int startIndex = parent->getIndexOf(item); ! int index = startIndex; do { index++; --- 363,368 ---- return; } ! unsigned int startIndex = parent->getIndexOf(item); ! unsigned int index = startIndex; do { index++; *************** *** 403,408 **** return; } ! int startIndex = parent->getIndexOf(menu); ! int index = startIndex; do { index++; --- 407,412 ---- return; } ! unsigned int startIndex = parent->getIndexOf(menu); ! unsigned int index = startIndex; do { index++; Index: uvalidator.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/uvalidator.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** uvalidator.cpp 3 Jun 2005 13:05:47 -0000 1.2 --- uvalidator.cpp 30 Sep 2005 12:37:20 -0000 1.3 *************** *** 155,159 **** return Invalid; } - bool ok = false; UIStringStream stream(*text); --- 155,158 ---- *************** *** 170,179 **** if (i < std::string::npos) { i++; ! int index = i; while (index < text->length() && isdigit((*text)[index])) { index++; } ! if (index - i > m_decimals) { return Intermediate; } --- 169,178 ---- if (i < std::string::npos) { i++; ! unsigned int index = i; while (index < text->length() && isdigit((*text)[index])) { index++; } ! if (int(index - i) > m_decimals) { return Intermediate; } Index: uvertexarray.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/uvertexarray.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** uvertexarray.cpp 16 Aug 2005 12:16:56 -0000 1.3 --- uvertexarray.cpp 30 Sep 2005 12:37:20 -0000 1.4 *************** *** 61,65 **** UVertexArray::setColor(const UColor & col) { if (m_colors.size() == 0 && m_vertices.size() > 0) { ! for (int i = 0; i < m_vertices.size(); ++i) { m_colors.push_back(UColor::black); } --- 61,65 ---- UVertexArray::setColor(const UColor & col) { if (m_colors.size() == 0 && m_vertices.size() > 0) { ! for (unsigned int i = 0; i < m_vertices.size(); ++i) { m_colors.push_back(UColor::black); } |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:37:30
|
Update of /cvsroot/libufo/ufo-0.5/src/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4188/src/text Modified Files: utextlayout.cpp Log Message: Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about unhandled switch values. Fixed warnings about unused variables. Index: utextlayout.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/text/utextlayout.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** utextlayout.cpp 20 Jul 2005 10:05:44 -0000 1.2 --- utextlayout.cpp 30 Sep 2005 12:37:20 -0000 1.3 *************** *** 121,125 **** layout(); int m_tabSize = 4; - int fontHeight = m_font.getFontMetrics()->getHeight(); int tabMultiplier = m_font.getFontMetrics()->getMaxCharWidth(); --- 121,124 ---- *************** *** 208,212 **** unsigned int index = line.getOffset(); ! unsigned int left = 0; for (;index < line.getOffset() + line.getLength() && index < m_length; --- 207,211 ---- unsigned int index = line.getOffset(); ! int left = 0; for (;index < line.getOffset() + line.getLength() && index < m_length; *************** *** 287,291 **** if (width + addWidth >= maxWidth) { ! int wrap_index = (index > 0) ? index - 1 : 0; char c = m_text[wrap_index]; while (!isWrapCharacter(c) && wrap_index > lineStart) { --- 286,290 ---- if (width + addWidth >= maxWidth) { ! unsigned int wrap_index = (index > 0) ? index - 1 : 0; char c = m_text[wrap_index]; while (!isWrapCharacter(c) && wrap_index > lineStart) { |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:37:30
|
Update of /cvsroot/libufo/ufo-0.5/src/layouts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4188/src/layouts Modified Files: uboxlayout.cpp Log Message: Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about unhandled switch values. Fixed warnings about unused variables. Index: uboxlayout.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/layouts/uboxlayout.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** uboxlayout.cpp 15 Sep 2005 10:18:00 -0000 1.13 --- uboxlayout.cpp 30 Sep 2005 12:37:20 -0000 1.14 *************** *** 250,254 **** UBoxLayout::getTotalFlex(const UWidget * container) { int ret = 0; ! for (int i = 0; i < container->getWidgetCount(); ++i) { ret += getFlex(container->getWidget(i)); } --- 250,254 ---- UBoxLayout::getTotalFlex(const UWidget * container) { int ret = 0; ! for (unsigned int i = 0; i < container->getWidgetCount(); ++i) { ret += getFlex(container->getWidget(i)); } |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:37:30
|
Update of /cvsroot/libufo/ufo-0.5/src/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4188/src/widgets Modified Files: ubutton.cpp ucombobox.cpp udesktoppane.cpp uinternalframe.cpp ulineedit.cpp ulistbox.cpp umenuitem.cpp urootpane.cpp uscrollbar.cpp uscrollpane.cpp uslider.cpp uspinbox.cpp utextedit.cpp utextwidget.cpp uviewport.cpp Log Message: Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about unhandled switch values. Fixed warnings about unused variables. Index: utextedit.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/utextedit.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** utextedit.cpp 15 Sep 2005 16:33:18 -0000 1.17 --- utextedit.cpp 30 Sep 2005 12:37:20 -0000 1.18 *************** *** 304,307 **** --- 304,309 ---- } break; + default: + break; } UWidget::processMouseEvent(e); Index: ulineedit.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/ulineedit.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ulineedit.cpp 5 Jul 2005 11:21:48 -0000 1.4 --- ulineedit.cpp 30 Sep 2005 12:37:20 -0000 1.5 *************** *** 126,130 **** } UDocument * doc = getDocument(); - UTextLayout * textLayout = getTextLayout(); char keyChar[1]; --- 126,129 ---- Index: ulistbox.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/ulistbox.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ulistbox.cpp 15 Sep 2005 10:13:21 -0000 1.22 --- ulistbox.cpp 30 Sep 2005 12:37:20 -0000 1.23 *************** *** 145,154 **** //UWidget::paintWidget(g); ! UInsets insets = getInsets(); // painting cells int x = insets.left; int y = insets.top; const UColor & background = getBackgroundColor(); const UColor & foreground = getForegroundColor(); const std::vector<UItem*> & items = getItems(); const UStyleHints * hints = getStyleHints(); --- 145,156 ---- //UWidget::paintWidget(g); ! //UInsets insets = getInsets(); // painting cells + /* int x = insets.left; int y = insets.top; const UColor & background = getBackgroundColor(); const UColor & foreground = getForegroundColor(); + */ const std::vector<UItem*> & items = getItems(); const UStyleHints * hints = getStyleHints(); *************** *** 206,212 **** case UEvent::MousePressed: e->consume(); ! ! int index = locationToIndex(e->getLocation()); ! setSelectedIndex(index); break; } --- 208,214 ---- case UEvent::MousePressed: e->consume(); ! setSelectedIndex(locationToIndex(e->getLocation())); ! break; ! default: break; } *************** *** 235,238 **** --- 237,242 ---- } break; + default: + break; } } Index: uscrollpane.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/uscrollpane.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** uscrollpane.cpp 12 Jul 2005 13:32:55 -0000 1.17 --- uscrollpane.cpp 30 Sep 2005 12:37:20 -0000 1.18 *************** *** 144,147 **** --- 144,149 ---- installScrollable(); break; + default: + break; } UWidget::processWidgetEvent(e); Index: uslider.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/uslider.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** uslider.cpp 21 May 2005 15:20:44 -0000 1.5 --- uslider.cpp 30 Sep 2005 12:37:20 -0000 1.6 *************** *** 41,46 **** USlider::USlider() : UAbstractSlider() - , m_mousePress() , m_isDragging(false) { // init sub controls for style --- 41,46 ---- USlider::USlider() : UAbstractSlider() , m_isDragging(false) + , m_mousePress() { // init sub controls for style *************** *** 54,59 **** USlider::USlider(Orientation orientation) : UAbstractSlider() - , m_mousePress() , m_isDragging(false) { setOrientation(orientation); --- 54,59 ---- USlider::USlider(Orientation orientation) : UAbstractSlider() , m_isDragging(false) + , m_mousePress() { setOrientation(orientation); *************** *** 68,73 **** USlider::USlider(int min, int max, int value) : UAbstractSlider() - , m_mousePress() , m_isDragging(false) { setRange(min, max); --- 68,73 ---- USlider::USlider(int min, int max, int value) : UAbstractSlider() , m_isDragging(false) + , m_mousePress() { setRange(min, max); *************** *** 83,88 **** USlider::USlider(Orientation orientation, int min, int max, int value) : UAbstractSlider() - , m_mousePress() , m_isDragging(false) { setOrientation(orientation); --- 83,88 ---- USlider::USlider(Orientation orientation, int min, int max, int value) : UAbstractSlider() , m_isDragging(false) + , m_mousePress() { setOrientation(orientation); *************** *** 180,183 **** --- 180,185 ---- } break; + default: + break; } Index: uspinbox.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/uspinbox.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** uspinbox.cpp 4 Sep 2005 14:59:41 -0000 1.2 --- uspinbox.cpp 30 Sep 2005 12:37:20 -0000 1.3 *************** *** 145,149 **** case UEvent::MousePressed: { e->consume(); - UPoint pos = e->getLocation(); UStyle::SubControls subctrl = getStyle()->getSubControlAt( UStyle::CE_SpinBox, getSize(), getStyleHints(), --- 145,148 ---- *************** *** 160,163 **** --- 159,164 ---- repaint(); break; + default: + break; } } *************** *** 168,171 **** --- 169,174 ---- repaint(); break; + default: + break; } UWidget::processMouseEvent(e); Index: udesktoppane.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/udesktoppane.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** udesktoppane.cpp 16 Jul 2005 13:42:31 -0000 1.3 --- udesktoppane.cpp 30 Sep 2005 12:37:20 -0000 1.4 *************** *** 113,116 **** --- 113,120 ---- w->setOrientation(Vertical); break; + case AllDockWidgetAreas: + // FIXME: what does this mean? + // seems to be non-sense here + break; } } *************** *** 180,184 **** // check for stays on top // FIXME: checks only for the top most ! int first = getLayerBegin(getLayer(frame)); if (first >= 0 && first < getWidgetCount()) { if (UInternalFrame * tempFrame = dynamic_cast<UInternalFrame*>(getWidget(first))) { --- 184,188 ---- // check for stays on top // FIXME: checks only for the top most ! unsigned int first = getLayerBegin(getLayer(frame)); if (first >= 0 && first < getWidgetCount()) { if (UInternalFrame * tempFrame = dynamic_cast<UInternalFrame*>(getWidget(first))) { *************** *** 288,291 **** --- 292,297 ---- ); break; + default: + break; } } *************** *** 316,319 **** --- 322,327 ---- } break; + default: + break; } } Index: umenuitem.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/umenuitem.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** umenuitem.cpp 21 Jun 2005 09:27:42 -0000 1.12 --- umenuitem.cpp 30 Sep 2005 12:37:20 -0000 1.13 *************** *** 153,156 **** --- 153,158 ---- } break; + default: + break; } UWidget::processMouseEvent(e); Index: ubutton.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/ubutton.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ubutton.cpp 2 Sep 2005 13:25:48 -0000 1.24 --- ubutton.cpp 30 Sep 2005 12:37:20 -0000 1.25 *************** *** 356,359 **** --- 356,361 ---- } break; + default: + break; } UWidget::processMouseEvent(e); *************** *** 421,439 **** // grab new mnemonic std::string text(getText()); // try lower case first ! m_acceleratorIndex = text.find(char(/*std::*/tolower(stroke.getKeyCode() + 32))); ! if (m_acceleratorIndex < text.length()) { ! getCompoundModel()->acceleratorIndex = m_acceleratorIndex; ! } else { // now normal ! m_acceleratorIndex = text.find(char(stroke.getKeyCode())); ! if (m_acceleratorIndex < text.length()) { ! getCompoundModel()->acceleratorIndex = m_acceleratorIndex; ! } else { //FIXME: oops, nothing ! m_acceleratorIndex = -1; } } updateMnemonic(); } else { --- 423,441 ---- // grab new mnemonic std::string text(getText()); + std::string::size_type index; // try lower case first ! index = text.find(char(/*std::*/tolower(stroke.getKeyCode() + 32))); ! if (index >= text.length()) { // now normal ! index = text.find(char(stroke.getKeyCode())); ! if (index >= text.length()) { //FIXME: oops, nothing ! getCompoundModel()->acceleratorIndex = -1; ! updateMnemonic(); ! return; } } + getCompoundModel()->acceleratorIndex = int(index); updateMnemonic(); } else { *************** *** 450,453 **** int UButton::getAcceleratorIndex() const { ! return m_acceleratorIndex; } --- 452,455 ---- int UButton::getAcceleratorIndex() const { ! return getCompoundModel()->acceleratorIndex; } Index: uviewport.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/uviewport.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** uviewport.cpp 12 Jul 2005 13:32:55 -0000 1.10 --- uviewport.cpp 30 Sep 2005 12:37:20 -0000 1.11 *************** *** 154,158 **** } ! const UPoint & p = m_view->getLocation(); // x vlaue --- 154,158 ---- } ! //const UPoint & p = m_view->getLocation(); // x vlaue Index: ucombobox.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/ucombobox.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ucombobox.cpp 5 Jul 2005 11:23:02 -0000 1.9 --- ucombobox.cpp 30 Sep 2005 12:37:20 -0000 1.10 *************** *** 261,264 **** --- 261,266 ---- popup(); break; + default: + break; } UWidget::processMouseEvent(e); *************** *** 312,315 **** --- 314,319 ---- break; */ + default: + break; } } Index: uscrollbar.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/uscrollbar.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** uscrollbar.cpp 21 May 2005 15:20:25 -0000 1.13 --- uscrollbar.cpp 30 Sep 2005 12:37:20 -0000 1.14 *************** *** 41,47 **** int minA, int maxA) : UAbstractSlider() - , m_visAmount(visAmountA) - , m_mousePress() , m_isDragging(false) { if (orientation != Horizontal) { --- 41,47 ---- int minA, int maxA) : UAbstractSlider() , m_isDragging(false) + , m_mousePress() + , m_visAmount(visAmountA) { if (orientation != Horizontal) { *************** *** 92,96 **** case UEvent::MousePressed: { e->consume(); - UPoint pos = e->getLocation(); UStyle::SubControls subctrl = getStyle()->getSubControlAt( UStyle::CE_ScrollBar, getSize(), getStyleHints(), --- 92,95 ---- *************** *** 121,124 **** --- 120,125 ---- setValue(getValue() + getBlockIncrement()); break; + default: + break; } } *************** *** 156,159 **** --- 157,162 ---- } break; + default: + break; } Index: utextwidget.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/utextwidget.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** utextwidget.cpp 15 Sep 2005 16:33:18 -0000 1.5 --- utextwidget.cpp 30 Sep 2005 12:37:20 -0000 1.6 *************** *** 60,66 **** : UScrollableWidget() //, std::streambuf() - , m_type() , m_doc(NULL) , m_textLayout(new UTextLayout()) , m_columns(0) , m_rows(0) --- 60,66 ---- : UScrollableWidget() //, std::streambuf() , m_doc(NULL) , m_textLayout(new UTextLayout()) + , m_type() , m_columns(0) , m_rows(0) *************** *** 82,88 **** : UScrollableWidget() //, std::streambuf() - , m_type() , m_doc(NULL) , m_textLayout(new UTextLayout()) , m_columns(0) , m_rows(0) --- 82,88 ---- : UScrollableWidget() //, std::streambuf() , m_doc(NULL) , m_textLayout(new UTextLayout()) + , m_type() , m_columns(0) , m_rows(0) *************** *** 339,342 **** --- 339,344 ---- } break; + default: + break; } UWidget::processMouseEvent(e); Index: urootpane.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/urootpane.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** urootpane.cpp 16 Jul 2005 13:42:31 -0000 1.14 --- urootpane.cpp 30 Sep 2005 12:37:20 -0000 1.15 *************** *** 255,259 **** URootLayout::layoutContainer(const UWidget * parent) { URectangle rect = parent->getInnerBounds(); ! int top = 0; m_rootPane->m_desktopPane->setBounds(rect); --- 255,259 ---- URootLayout::layoutContainer(const UWidget * parent) { URectangle rect = parent->getInnerBounds(); ! //int top = 0; m_rootPane->m_desktopPane->setBounds(rect); Index: uinternalframe.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/widgets/uinternalframe.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** uinternalframe.cpp 20 Jul 2005 09:53:32 -0000 1.17 --- uinternalframe.cpp 30 Sep 2005 12:37:20 -0000 1.18 *************** *** 301,304 **** --- 301,306 ---- vertical = 0; break; + default: + break; } UWidget::processMouseEvent(e); *************** *** 322,325 **** --- 324,329 ---- m_desktop = NULL; break; + default: + break; } UWidget::processWidgetEvent(e); *************** *** 425,428 **** --- 429,434 ---- } break; + default: + break; } repaint(); *************** *** 441,444 **** --- 447,452 ---- } break; + default: + break; } UWidget::processMouseEvent(e); |
|
From: Johannes S. <sch...@us...> - 2005-09-30 12:37:30
|
Update of /cvsroot/libufo/ufo-0.5/src/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4188/src/ui Modified Files: ubasicstyle.cpp Log Message: Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about unhandled switch values. Fixed warnings about unused variables. Index: ubasicstyle.cpp =================================================================== RCS file: /cvsroot/libufo/ufo-0.5/src/ui/ubasicstyle.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ubasicstyle.cpp 3 Sep 2005 10:06:50 -0000 1.6 --- ubasicstyle.cpp 30 Sep 2005 12:37:20 -0000 1.7 *************** *** 85,89 **** y[0] = middle_y - half_size; y[1] = y[2] = middle_y + half_size; ! break; case UStyle::PE_IndicatorArrowDown: x[0] = middle_x; --- 85,89 ---- y[0] = middle_y - half_size; y[1] = y[2] = middle_y + half_size; ! break; case UStyle::PE_IndicatorArrowDown: x[0] = middle_x; *************** *** 92,96 **** y[0] = middle_y + half_size; y[1] = y[2] = middle_y - half_size; ! break; case UStyle::PE_IndicatorArrowLeft: x[0] = middle_x - half_size; --- 92,96 ---- y[0] = middle_y + half_size; y[1] = y[2] = middle_y - half_size; ! break; case UStyle::PE_IndicatorArrowLeft: x[0] = middle_x - half_size; *************** *** 99,104 **** y[1] = middle_y - 2*half_size; y[2] = middle_y + 2*half_size; ! break; case UStyle::PE_IndicatorArrowRight: x[0] = middle_x + half_size; x[1] = x[2] = middle_x - half_size; --- 99,106 ---- y[1] = middle_y - 2*half_size; y[2] = middle_y + 2*half_size; ! break; case UStyle::PE_IndicatorArrowRight: + // shouldn't happen, but use right arrow as default + default: x[0] = middle_x + half_size; x[1] = x[2] = middle_x - half_size; *************** *** 106,112 **** y[1] = middle_y + 2*half_size; y[2] = middle_y - 2*half_size; ! break; ! default: ! break; } --- 108,112 ---- y[1] = middle_y + 2*half_size; y[2] = middle_y - 2*half_size; ! break; } *************** *** 351,354 **** --- 351,359 ---- } break; + case PE_PanelToolBar: + // FIXME: not yet implemented + break; + default: + break; } } *************** *** 1132,1135 **** --- 1137,1146 ---- } break; + case CE_StaticText: + case CE_ToolButton: + // FIXME: not yet implemented + break; + default: + break; } } *************** *** 1166,1169 **** --- 1177,1182 ---- return UInsets(2, 3, 3, 3); break; + default: + break; } break; *************** *** 1217,1223 **** URectangle rect = getSubControlBounds(elem, rect, hints, model, SC_SliderHandle); if (rect.contains(pos)) { ! SC_SliderHandle; } else { ! SC_SliderGroove; } } --- 1230,1236 ---- URectangle rect = getSubControlBounds(elem, rect, hints, model, SC_SliderHandle); if (rect.contains(pos)) { ! return SC_SliderHandle; } else { ! return SC_SliderGroove; } } *************** *** 1259,1262 **** --- 1272,1277 ---- } break; + default: + break; } return SC_None; *************** *** 1294,1297 **** --- 1309,1314 ---- } break; + default: + break; } } *************** *** 1355,1358 **** --- 1372,1377 ---- } break; + default: + break; } } *************** *** 1367,1370 **** --- 1386,1391 ---- case SC_ComboBoxListBoxPopup: break; + default: + break; } break; *************** *** 1379,1382 **** --- 1400,1405 ---- ret.setBounds(rect.w - 12, 8, 12, 8); break; + default: + break; } break; *************** *** 1404,1411 **** --- 1427,1438 ---- } break; + default: + break; } } } break; + default: + break; } return ret; |
