[PyKDE] Minor changes for Qt 2.1.0 and QGroupBox

Pete Ware ware at cis.ohio-state.edu
Sat May 27 00:02:12 BST 2000


I added the symbol QT_21x as Qt 2.1.0 added some member functions.  I
also made the updates for qgroupbox's new member functions:
        columns(), setColumns(), orientation(), setOrientation(),addSpace()

It seemed like QT_21x should be a "Secondary" symbol.  I took that to mean
that the Primary symbol has to be defined and the secondary is a check
within that.

--pete

diff -r -c PyQt-0.13pre1/sip/qgroupbox.sip sip/qgroupbox.sip
*** PyQt-0.13pre1/sip/qgroupbox.sip	Wed May 24 04:34:47 2000
--- sip/qgroupbox.sip	Fri May 26 17:49:39 2000
***************
*** 42,48 ****
--- 42,55 ----
  	QString title() const;
  	virtual void setTitle(const QString &);
  	virtual void setAlignment(int);
+ %If Version(QT_21x)
+ 	int columns () const;
+ 	void setColumns ( int );
+ 	Orientation orientation () const;
+ 	void setOrientation(Orientation);
+ 	void addSpace ( int );
  %End
+ %End
  
  protected:
  	void paintEvent(QPaintEvent *);
diff -r -c PyQt-0.13pre1/sip/qt.sip sip/qt.sip
*** PyQt-0.13pre1/sip/qt.sip	Wed May 24 04:34:47 2000
--- sip/qt.sip	Fri May 26 17:48:19 2000
***************
*** 11,21 ****
  %Version QT_1x		"QT_VERSION < 200"	"QT_VERSION < 200"
  %Version QT_143		"QT_VERSION >= 143"
  %Version QT_2x		"QT_VERSION >= 200"	"QT_VERSION >= 200"
  %Version WS_X11		"defined(_WS_X11_)"	"libqtc.qtIsX11()"
  %Version WS_WIN		"defined(_WS_WIN_)"	"libqtc.qtIsWin()"
  
  %PrimaryVersions	{QT_1x QT_2x}
! %SecondaryVersions	{WS_X11 WS_WIN}
  
  
  %Doc
--- 11,22 ----
  %Version QT_1x		"QT_VERSION < 200"	"QT_VERSION < 200"
  %Version QT_143		"QT_VERSION >= 143"
  %Version QT_2x		"QT_VERSION >= 200"	"QT_VERSION >= 200"
+ %Version QT_21x		"QT_VERSION >= 210"	"QT_VERSION >= 210"
  %Version WS_X11		"defined(_WS_X11_)"	"libqtc.qtIsX11()"
  %Version WS_WIN		"defined(_WS_WIN_)"	"libqtc.qtIsWin()"
  
  %PrimaryVersions	{QT_1x QT_2x}
! %SecondaryVersions	{WS_X11 WS_WIN QT_21x}
  
  
  %Doc




More information about the PyQt mailing list