From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 6 Feb 2022 16:04:24 +0100
Subject: New upstream version 5.2.2GA

---
 app/bin/layout.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/bin/layout.h')

diff --git a/app/bin/layout.h b/app/bin/layout.h
index fcb5160..6e9496d 100644
--- a/app/bin/layout.h
+++ b/app/bin/layout.h
@@ -24,7 +24,6 @@
 #define HAVE_LAYOUT_H
 
 #include "common.h"
-#include "misc.h"
 
 
 void SetLayoutFullPath(const char *fileName);
@@ -44,6 +43,8 @@ void SetLayoutBackGroundPos(coOrd pos);
 void SetLayoutBackGroundAngle(ANGLE_T angle);
 void SetLayoutBackGroundScreen(int screen);
 
+int DoSettingsRead(int files, char ** fileName, void * data );
+
 char *GetLayoutFullPath(void);
 char *GetLayoutFilename(void);
 char *GetLayoutTitle(void);
@@ -52,6 +53,7 @@ DIST_T GetLayoutMinTrackRadius(void);
 SCALEINX_T GetLayoutCurScale(void );
 SCALEDESCINX_T GetLayoutCurScaleDesc(void);
 //GAUGEINX_T GetLayoutCurGauge(void);
+void GetLayoutRoomSize(coOrd *roomSize);
 
 ANGLE_T GetLayoutMaxTrackGrade(void);
 SCALEDESCINX_T GetLayoutCurScaleDesc(void);
@@ -61,10 +63,11 @@ coOrd GetLayoutBackGroundPos(void);
 ANGLE_T GetLayoutBackGroundAngle(void);
 int GetLayoutBackGroundScreen(void);
 int GetLayoutBackGroundVisible(void);
+bool HasBackGround(void);
 void LayoutBackGroundInit(BOOL_T clear);
 void LayoutBackGroundLoad(void);
 void LayoutBackGroundSave(void);
-void BackgroundToggleShow(void);
-void DoLayout(void * junk);
+void BackgroundToggleShow(void * unused);
+void DoLayout(void * unused);
 int LoadImageFile(int files,char ** fileName,void * data );
 #endif
-- 
cgit v1.2.3


From a14a7a0ccc9de76aeab0b2e4bbf58f1a79deedc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 3 Jul 2024 10:19:30 +0200
Subject: New upstream version 5.3.0GA

---
 app/bin/layout.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/bin/layout.h')

diff --git a/app/bin/layout.h b/app/bin/layout.h
index 6e9496d..1d6c694 100644
--- a/app/bin/layout.h
+++ b/app/bin/layout.h
@@ -1,9 +1,9 @@
 /** \file layout.h
- * Layout data 
+ * Layout data
  */
 
 /*  XTrkCad - Model Railroad CAD
- *  Copyright (C) 2017 Martin Fischer 
+ *  Copyright (C) 2017 Martin Fischer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef HAVE_LAYOUT_H
@@ -25,9 +25,10 @@
 
 #include "common.h"
 
-
+extern wButton_p backgroundB;		/** background visibility control */
 void SetLayoutFullPath(const char *fileName);
 void LoadLayoutMinRadiusPref(char *scaleName, double defaultValue);
+void LoadLayoutMaxGradePref(char *scaleName, double defaultValue);
 void SetLayoutTitle(char *title);
 void SetLayoutSubtitle(char *title);
 void SetLayoutMinTrackRadius(DIST_T radius);
@@ -36,7 +37,6 @@ void SetLayoutRoomSize(coOrd size);
 void SetLayoutCurScale(SCALEINX_T scale);
 void SetLayoutCurScaleDesc(SCALEDESCINX_T desc);
 void SetLayoutCurGauge(GAUGEINX_T gauge);
-void SetLayoutScaleGauge(SCALEDESCINX_T desc, GAUGEINX_T gauge);
 void SetLayoutBackGroundFullPath(const char *fileName);
 void SetLayoutBackGroundSize(double size);
 void SetLayoutBackGroundPos(coOrd pos);
@@ -45,17 +45,17 @@ void SetLayoutBackGroundScreen(int screen);
 
 int DoSettingsRead(int files, char ** fileName, void * data );
 
+BOOL_T GetLayoutChanged(void);
 char *GetLayoutFullPath(void);
 char *GetLayoutFilename(void);
 char *GetLayoutTitle(void);
 char *GetLayoutSubtitle(void);
 DIST_T GetLayoutMinTrackRadius(void);
+ANGLE_T GetLayoutMaxTrackGrade(void);
 SCALEINX_T GetLayoutCurScale(void );
 SCALEDESCINX_T GetLayoutCurScaleDesc(void);
-//GAUGEINX_T GetLayoutCurGauge(void);
 void GetLayoutRoomSize(coOrd *roomSize);
 
-ANGLE_T GetLayoutMaxTrackGrade(void);
 SCALEDESCINX_T GetLayoutCurScaleDesc(void);
 char *GetLayoutBackGroundFullPath(void);
 double GetLayoutBackGroundSize(void);
-- 
cgit v1.2.3