summaryrefslogtreecommitdiff
path: root/app/bin/draw.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-03-19 19:56:15 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-03-19 19:56:15 +0100
commit1542c122b3672fe83e027411ad2445772e2d0ed3 (patch)
treee535bc621bd7ffa9d5ce89e0d495df5d1c4ab6fd /app/bin/draw.h
parent773810e6583142d7d15263e6481c42aebed6d7f1 (diff)
parentd1a8285f818eb7e5c3d6a05709ea21a808490b8c (diff)
Update upstream source from tag 'upstream/5.1.0'
Update to upstream version '5.1.0' with Debian dir 93ca74b8b4602fce4c9c7740e0cfdde25f086673
Diffstat (limited to 'app/bin/draw.h')
-rw-r--r--app/bin/draw.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/app/bin/draw.h b/app/bin/draw.h
index db8d91a..6a7d806 100644
--- a/app/bin/draw.h
+++ b/app/bin/draw.h
@@ -1,5 +1,5 @@
/** \file draw.h
- *
+ * Definitions and prototypes for drawing operations
*/
/* XTrkCad - Model Railroad CAD
@@ -23,8 +23,8 @@
#ifndef DRAW_H
#define DRAW_H
-#define MSG_BASE (1000)
-#include "messages.h"
+#include "common.h"
+#include "wlib.h"
#define DC_TICKS (1<<1)
#define DC_PRINT (1<<2)
@@ -106,6 +106,7 @@ extern long drawCount;
extern BOOL_T drawEnable;
extern long currRedraw;
+
extern wDrawColor drawColorBlack;
extern wDrawColor drawColorWhite;
extern wDrawColor drawColorRed;
@@ -117,6 +118,7 @@ extern wDrawColor drawColorGold;
#define wDrawColorBlack drawColorBlack
#define wDrawColorWhite drawColorWhite
#define wDrawColorBlue drawColorBlue
+#define wDrawColorRed drawColorRed
extern wDrawColor markerColor;
extern wDrawColor borderColor;
@@ -167,8 +169,10 @@ void DrawHilightPolygon( drawCmd_p, coOrd *, int );
#define BOX_ARROW (4)
#define BOX_BACKGROUND (5)
void DrawBoxedString( int, drawCmd_p, coOrd, char *, wFont_p, wFontSize_t, wDrawColor, ANGLE_T );
-void DrawTextSize2( drawCmd_p, char *, wFont_p, wFontSize_t, BOOL_T, coOrd *, POS_T * );
+void DrawMultiLineTextSize(drawCmd_p dp, char * text, wFont_p fp, wFontSize_t fs, BOOL_T relative, coOrd * size, coOrd * lastline );
+void DrawTextSize2( drawCmd_p, char *, wFont_p, wFontSize_t, BOOL_T, coOrd *, POS_T *);
void DrawTextSize( drawCmd_p, char *, wFont_p, wFontSize_t, BOOL_T, coOrd * );
+void DrawMultiString(drawCmd_p d, coOrd pos, char * text, wFont_p fp, wFontSize_t fs, wDrawColor color, ANGLE_T a, coOrd * lo, coOrd * hi);
BOOL_T SetRoomSize( coOrd );
void GetRoomSize( coOrd * );
void DoRedraw( void );
@@ -192,6 +196,8 @@ void InfoPos( coOrd );
void InfoCount( wIndex_t );
void SetMessage( char * );
+wIndex_t panCmdInx;
+
void InfoSubstituteControls( wControl_p *, char * * );
void MapGrid( coOrd, coOrd, ANGLE_T, coOrd, ANGLE_T, POS_T, POS_T, int *, int *, int *, int * );