From d15cb1ba092cb7d0c1c0ef212df6cc7304d74bc3 Mon Sep 17 00:00:00 2001 From: Stelios Bounanos Date: Wed, 30 Apr 2008 14:54:13 +0100 Subject: [PATCH] Upstream version 2.11X --- ChangeLog | 2 +- configure.ac | 2 +- src/misc/status.cxx | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cdad2db..b047e6ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ Change Log: 2.11 1) Added EXEC macro 2) Added mousewheel over Macro buttons to move between macro button sets. 3) Fixed bug in Olivia signal level display. - 4) Ported to Windows (win32) + 4) Ported to Windows (win32) and OS-X 5) Added floating digiscope and / or fixed scope abutting waterfall specified with command line switch --twoscopes Default is floating digiscope without the fixed scope diff --git a/configure.ac b/configure.ac index 871864f4..23f7bf25 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may dnl contain other characters or be empty m4_define(FLDIGI_MAJOR, [2]) m4_define(FLDIGI_MINOR, [11]) -m4_define(FLDIGI_PATCH, [W]) +m4_define(FLDIGI_PATCH, [X]) AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com]) diff --git a/src/misc/status.cxx b/src/misc/status.cxx index 5c7eb2ea..5aa08100 100644 --- a/src/misc/status.cxx +++ b/src/misc/status.cxx @@ -250,9 +250,10 @@ void status::initLastState() Yx = TransmitText->y(); Hx = TransmitText->h(); - ReceiveText->resize(X,Y,W,RxTextHeight); - FHdisp->resize(X,Y,W,RxTextHeight); - TransmitText->resize(X, Y + RxTextHeight, W, H + Hx - RxTextHeight); +// ReceiveText->resize(X,Y,W,RxTextHeight); +// FHdisp->resize(X,Y,W,RxTextHeight); +// TransmitText->resize(X, Y + RxTextHeight, W, H + Hx - RxTextHeight); + TiledGroup->position( X, Y + H, X, Y + RxTextHeight); } if (rigShown == true) {