From 0976d41b2c791e3a9c1eedc5f524c308b98ee4f2 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Fri, 9 Apr 2010 10:00:26 +0000 Subject: [PATCH] 2010-04-09 02:58 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbxbp/xbp.ch * contrib/hbxbp/xbpdialog.prg + Added some missing instance variables. Thanks Shum for reporting. --- harbour/ChangeLog | 5 +++++ harbour/contrib/hbxbp/xbp.ch | 20 ++++++++++++++++++++ harbour/contrib/hbxbp/xbpdialog.prg | 12 +++++++++--- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1503ecf2ba..78275d7738 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-09 02:58 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbxbp/xbp.ch + * contrib/hbxbp/xbpdialog.prg + + Added some missing instance variables. Thanks Shum for reporting. + 2010-04-09 08:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg * _EOL -> _CHR_EOL diff --git a/harbour/contrib/hbxbp/xbp.ch b/harbour/contrib/hbxbp/xbp.ch index d61a8ef514..5fbefacdb7 100644 --- a/harbour/contrib/hbxbp/xbp.ch +++ b/harbour/contrib/hbxbp/xbp.ch @@ -420,6 +420,26 @@ #define XBPBRW_Pan_LastCol 4 #define XBPBRW_Pan_Track 5 +#define XBPDLG_NO_BORDER 1 +#define XBPDLG_SIZEBORDER 2 +#define XBPDLG_THINBORDER 3 +#define XBPDLG_DLGBORDER 4 +#define XBPDLG_RAISEDBORDERTHICK 5 +#define XBPDLG_RAISEDBORDERTHIN 6 +#define XBPDLG_RECESSEDBORDERTHICK 7 +#define XBPDLG_RECESSEDBORDERTHIN 8 +#define XBPDLG_RAISEDBORDERTHICK_FIXED 9 +#define XBPDLG_RAISEDBORDERTHIN_FIXED 10 +#define XBPDLG_RECESSEDBORDERTHICK_FIXED 11 +#define XBPDLG_RECESSEDBORDERTHIN_FIXED 12 + +#define XBPDLG_ORIGIN_OWNER 1 +#define XBPDLG_ORIGIN_SCREEN 2 +#define XBPDLG_ORIGIN_MOUSE 3 + +#define XBP_ORIGIN_TOPLEFT 1 +#define XBP_ORIGIN_BOTTOMLEFT 2 + /*----------------------------------------------------------------------*/ /* Harbour Specific Constants */ diff --git a/harbour/contrib/hbxbp/xbpdialog.prg b/harbour/contrib/hbxbp/xbpdialog.prg index 9b224281a9..70b76be8f3 100644 --- a/harbour/contrib/hbxbp/xbpdialog.prg +++ b/harbour/contrib/hbxbp/xbpdialog.prg @@ -80,12 +80,18 @@ CLASS XbpDialog FROM XbpWindow DATA oMenu DATA aRect - DATA maxbutton INIT .t. - DATA minbutton INIT .t. + DATA maxbutton INIT .T. + DATA minbutton INIT .T. DATA drawingArea - DATA tasklist INIT .t. + DATA tasklist INIT .T. DATA oEventLoop + DATA alwaysOnTop INIT .F. + DATA border INIT XBPDLG_RAISEDBORDERTHICK + DATA titleBar INIT .F. + DATA moveWithOwner INIT .T. + DATA origin INIT XBPDLG_ORIGIN_OWNER + METHOD new( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) METHOD hbCreateFromQtPtr( oParent, oOwner, aPos, aSize, aPresParams, lVisible, pQtObject )