Skip to content

Commit

Permalink
Reapply "2024-12-12 20:46 UTC+0100 Przemyslaw Czerpak (druzus/at/pocz…
Browse files Browse the repository at this point in the history
…ta.onet.pl)"

This reverts commit af7b3d2.
  • Loading branch information
druzus committed Dec 12, 2024
1 parent af7b3d2 commit 0ef2032
Show file tree
Hide file tree
Showing 7 changed files with 535 additions and 9 deletions.
26 changes: 26 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,32 @@
Entries may not always be in chronological/commit order.
See license at the end of file. */

2024-12-12 20:46 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/xhb/hbcompat.ch
! fixed HSetAACompatibility() #xtranslate

* contrib/hbzebra/code39.c
* pacified warning, it's also fix for possible buffer overflow.

* include/hbcomp.h
* src/compiler/genc.c
* src/compiler/hbmain.c
* replaced function hb_compFunctionMarkStatic() with
hb_compFunctionSetScope()

* src/compiler/genc.c
* detect public prg functions written in C inside
#pragma BEGINDUMP / #pragma ENDDUMP and mark them as LOCAL ones

* src/vm/hvm.c
! removed my pseudo fix from 2023-01-30 15:18 UTC+0100 Przemyslaw Czerpak.
It was ugly hack which can work only with some linkers.
This modification fixes FILE() function used with C functions written
without own symbol table

* src/rdd/dbf1.c
* minor code formatting

2024-12-11 19:35 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/xhb/hbcompat.ch
! fixed HSetAACompatibility() #xtranslate
Expand Down
37 changes: 37 additions & 0 deletions contrib/gtqtc/gtqtc.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@

#include <QtCore/QThread>
#include <QtCore/QMutex>
#include <QtCore/QPointer>

#include <QtGui/QFont>
#include <QtGui/QColor>
Expand All @@ -74,6 +75,8 @@
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QAbstractButton>
#include <QtWidgets/QAction>
#include <QtWidgets/QLabel>
#include <QtWidgets/QGraphicsDropShadowEffect>
#ifdef HB_QT_SOUND
#include <QtMultimedia/QSound>
#endif
Expand All @@ -85,6 +88,10 @@
#include <QtGui/QMessageBox>
#include <QtGui/QAbstractButton>
#include <QtGui/QAction>
#include <QtGui/QLabel>
#if QT_VERSION >= 0x040600
#include <QtGui/QGraphicsDropShadowEffect>
#endif
#ifdef HB_QT_SOUND
#include <QtGui/QSound>
#endif
Expand Down Expand Up @@ -373,6 +380,7 @@ class QTConsole : public QWidget
void setImageSize( void );
void copySelection( void );
void repaintChars( const QRect & rx );
void updateArea( const QRect & rx );

protected:
void inputMethodEvent( QInputMethodEvent * evt );
Expand Down Expand Up @@ -408,4 +416,33 @@ class QTCWindow : public QMainWindow
void closeEvent( QCloseEvent * evt );
};


class QTCRegion : public QWidget
{
Q_OBJECT

public:
QTCRegion( PHB_GTQTC pStructQTC, int iTop, int iLeft, int iBottom, int iRight );
virtual ~QTCRegion( void );

void setPos( int iR, int iC );
void setSize( int iH, int iW );
void setColor( PHB_ITEM pColor, PHB_ITEM pShadow = NULL );
void setLabel( PHB_ITEM pLabel );
void updateSize( void );

PHB_GTQTC pQTC;
QTConsole * qConsole;
QLabel * label;

int iRow;
int iCol;
int iHeight;
int iWidth;
double dTxtSize;

protected:
void paintEvent( QPaintEvent * evt );
};

#endif /* HB_QTC_H_ */
Loading

0 comments on commit 0ef2032

Please sign in to comment.