ObjQt  Diff

Differences From Artifact [7a67030b98]:

To Artifact [6a47526835]:


24
25
26
27
28
29
30
31
32
33
34
35

36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
#import "QtAbstractButton.h"

#include <QMenu>
#include <QPushButton>

@interface QtPushButton: QtAbstractButton
@property (readonly) QPushButton *qPushButton;
@property QMenu* menu;
@property bool autoDefault;
@property (getter=isDefault, setter=setDefault:) bool default_;
@property (getter=isFlat) bool flat;


- initWithQPushButton: (QPushButton*)qPushButton;
- initWithText: (OFString*)text;
- initWithIcon: (QIcon)icon
	  text: (OFString*)text;
@end

namespace ObjQt {

static OF_INLINE QtPushButton*
toOF(QPushButton *qPushButton)
{
	return [[[QtPushButton alloc]
	    initWithQPushButton: qPushButton] autorelease];
}

static OF_INLINE QPushButton*
toQt(QtPushButton *pushButton)
{
	return [pushButton qPushButton];
}

}







|




>
|
|

|




|






|






24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
#import "QtAbstractButton.h"

#include <QMenu>
#include <QPushButton>

@interface QtPushButton: QtAbstractButton
@property (readonly) QPushButton *qPushButton;
@property QMenu *menu;
@property bool autoDefault;
@property (getter=isDefault, setter=setDefault:) bool default_;
@property (getter=isFlat) bool flat;

- initWithQAbstractButton: (QAbstractButton *)qAbstractButton OF_UNAVAILABLE;
- initWithQPushButton: (QPushButton *)qPushButton;
- initWithText: (OFString *)text;
- initWithIcon: (QIcon)icon
	  text: (OFString *)text;
@end

namespace ObjQt {

static OF_INLINE QtPushButton *
toOF(QPushButton *qPushButton)
{
	return [[[QtPushButton alloc]
	    initWithQPushButton: qPushButton] autorelease];
}

static OF_INLINE QPushButton *
toQt(QtPushButton *pushButton)
{
	return [pushButton qPushButton];
}

}