Add NFlags parameter to QWidget constructor

This relies on GIT hash 0eb9f5e2 and breaks the ABI versus Qt 3.3.8
pull/2/head
Timothy Pearson 13 years ago
parent 783aa27bae
commit d51c5c4d31

@ -847,7 +847,7 @@ QSize qt_naturalWidgetSize( QWidget *w ) {
/*!
Constructs a widget which is a child of \a parent, with the name
\a name and widget flags set to \a f.
\a name, widget flags set to \a f, and NETWM flags set to \a n.
If \a parent is 0, the new widget becomes a top-level window. If
\a parent is another widget, this widget becomes a child window
@ -877,7 +877,7 @@ QSize qt_naturalWidgetSize( QWidget *w ) {
\endcode
*/
QWidget::QWidget( QWidget *parent, const char *name, WFlags f )
QWidget::QWidget( QWidget *parent, const char *name, WFlags f, NFlags n )
: QObject( parent, name ), QPaintDevice( QInternal::Widget )
{
#if defined(QT_CHECK_STATE) && !defined(Q_WS_WIN)
@ -893,7 +893,7 @@ QWidget::QWidget( QWidget *parent, const char *name, WFlags f )
winid = 0; // default attributes
widget_state = 0;
widget_flags = f;
netwm_flags = 0;
netwm_flags = n;
focus_policy = 0;
own_font = 0;
own_palette = 0;

@ -139,7 +139,7 @@ class Q_EXPORT QWidget : public QObject, public QPaintDevice
Q_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false )
public:
Q_EXPLICIT QWidget( QWidget* parent=0, const char* name=0, WFlags f=0 );
Q_EXPLICIT QWidget( QWidget* parent=0, const char* name=0, WFlags f=0, NFlags n=0 );
~QWidget();
WId winId() const;

Loading…
Cancel
Save