Subversion Repositories tpanel

Rev

Rev 386 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 386 Rev 391
Line 32... Line 32...
32 
#include <QTextLayout>
 32 
#include <QTextLayout>
33 
#endif
 33 
#endif
34 
#include "tobject.h"
 34 
#include "tobject.h"
35 
#include "terror.h"
 35 
#include "terror.h"
36 
#include "tqscrollarea.h"
 36 
#include "tqscrollarea.h"
- 
 
 37 
#include "tqmarquee.h"
37 
#include "tlock.h"
 38 
#include "tlock.h"
38 
#include "tqtmain.h"
 39 
#include "tqtmain.h"
39 
#include "tresources.h"
 40 
#include "tresources.h"
40 
 
 41 
 
41 
using std::string;
 42 
using std::string;
Line 103... Line 104...
103 
                    obj->object.label = nullptr;
 104 
                    obj->object.label = nullptr;
104 
 
 105 
 
105 
                obj->invalid = true;
 106 
                obj->invalid = true;
106 
            break;
 107 
            break;
107 
 
 108 
 
- 
 
 109 
            case OBJ_MARQUEE:
- 
 
 110 
                if (obj->object.marquee)
- 
 
 111 
                    obj->object.marquee = nullptr;
- 
 
 112 
 
- 
 
 113 
                obj->invalid = true;
- 
 
 114 
            break;
- 
 
 115 
 
108 
            // This are the parent widgets (windows) and must be deleted.
 116 
            // This are the parent widgets (windows) and must be deleted.
109 
            // If this widgets are deleted, Qt deletes their children.
 117 
            // If this widgets are deleted, Qt deletes their children.
110 
            case OBJ_PAGE:
 118 
            case OBJ_PAGE:
111 
            case OBJ_SUBPAGE:
 119 
            case OBJ_SUBPAGE:
112 
                obj->invalid = true;
 120 
                obj->invalid = true;
Line 652... Line 660...
652 
string TObject::objectToString(TObject::OBJECT_TYPE o)
 660 
string TObject::objectToString(TObject::OBJECT_TYPE o)
653 
{
 661 
{
654 
    switch(o)
 662 
    switch(o)
655 
    {
 663 
    {
656 
        case OBJ_BUTTON:  return "BUTTON"; break;
 664 
        case OBJ_BUTTON:  return "BUTTON"; break;
- 
 
 665 
        case OBJ_MARQUEE: return "MARQUEE"; break;
657 
        case OBJ_INPUT:   return "INPUT"; break;
 666 
        case OBJ_INPUT:   return "INPUT"; break;
658 
        case OBJ_NONE:    return "undefined"; break;
 667 
        case OBJ_NONE:    return "undefined"; break;
659 
        case OBJ_PAGE:    return "PAGE"; break;
 668 
        case OBJ_PAGE:    return "PAGE"; break;
660 
        case OBJ_SUBPAGE: return "SUBPAGE"; break;
 669 
        case OBJ_SUBPAGE: return "SUBPAGE"; break;
661 
        case OBJ_TEXT:    return "TEXT"; break;
 670 
        case OBJ_TEXT:    return "TEXT"; break;