X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Fwm.h;h=9ce35443b0b6523fdb8f9b8a533a71389aaffba7;hb=43992cf707ec82f8ffd3a1500ad5952640335a6d;hp=96d488d588318a7726a01f9c196207213bd30866;hpb=b98fbd4e9c71447d81fc9bd643fb174c76346e0f;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/wm.h b/Usermode/Applications/axwin2_src/WM/wm.h
index 96d488d5..9ce35443 100644
--- a/Usermode/Applications/axwin2_src/WM/wm.h
+++ b/Usermode/Applications/axwin2_src/WM/wm.h
@@ -2,14 +2,18 @@
 #ifndef _WM_H_
 #define _WM_H_
 
-typedef struct sElement
+#include <axwin2/axwin.h>
+
+typedef struct sAxWin_Element	tElement;
+
+struct sAxWin_Element
 {
 	 int	Type;
 	
-	struct sElement	*Parent;
-	struct sElement	*FirstChild;
-	struct sElement	*LastChild;
-	struct sElement	*NextSibling;
+	tElement	*Parent;
+	tElement	*FirstChild;
+	tElement	*LastChild;
+	tElement	*NextSibling;
 	
 	short	PaddingL, PaddingR;
 	short	PaddingT, PaddingB;
@@ -31,15 +35,18 @@ typedef struct sElement
 	// -- Render Cache
 	short	CachedX, CachedY;
 	short	CachedW, CachedH;
-}	tElement;
+	
+	char	DebugName[];
+};
 
 typedef struct sTab
 {
 	 int	Type;	// Should be zero, allows a tab to be the parent of an element
 	
-	struct sElement	*Parent;
-	struct sElement	*FirstChild;
-	struct sElement	*LastChild;
+	tElement	*Parent;
+	tElement	*FirstChild;
+	tElement	*LastChild;
+	struct sTab	*NextTab;
 	
 	char	*Name;
 	
@@ -56,88 +63,4 @@ typedef struct sApplication
 	char	Name[];
 }	tApplication;
 
-// === CONSTANTS ===
-enum eElementFlags
-{
-	/**
-	 * \brief Rendered
-	 * 
-	 * If set, the element will be ignored in calculating sizes and
-	 * rendering.
-	 */
-	ELEFLAG_NORENDER    = 0x001,
-	/**
-	 * \brief Element visibility
-	 * 
-	 * If set, the element is not drawn.
-	 */
-	ELEFLAG_INVISIBLE   = 0x002,
-	
-	/**
-	 * \brief Position an element absulutely
-	 */
-	ELEFLAG_ABSOLUTEPOS = 0x004,
-	
-	/**
-	 * \brief Fixed size element
-	 */
-	ELEFLAG_FIXEDSIZE   = 0x008,
-	
-	/**
-	 * \brief Element "orientation"
-	 */
-	ELEFLAG_VERTICAL    = 0x010,//	ELEFLAG_HORIZONTAL  = 0x000,
-	/**
-	 * \brief Action for text that overflows
-	 */
-	ELEFLAG_WRAP        = 0x020,//	ELEFLAG_NOWRAP      = 0x000,
-	/**
-	 * \brief Cross size action
-	 * 
-	 * If this flag is set, the element will only be as large (across
-	 * its parent) as is needed to encase the contents of the element.
-	 * Otherwise, the element will expand to fill all avaliable space.
-	 */
-	ELEFLAG_NOEXPAND    = 0x040,
-	
-	ELEFLAG_NOSTRETCH   = 0x080,
-	
-	/**
-	 * \brief Center alignment
-	 */
-	ELEFLAG_ALIGN_CENTER= 0x100,
-	/**
-	 * \brief Right/Bottom alignment
-	 */
-	ELEFLAG_ALIGN_END = 0x200
-};
-
-/**
- */
-enum eElementTypes
-{
-	ELETYPE_NONE,
-	
-	ELETYPE_BOX,	//!< Content box
-	ELETYPE_TABBAR,	//!< Tab Bar
-	ELETYPE_TOOLBAR,	//!< Tool Bar
-	
-	ELETYPE_BUTTON,	//!< Push Button
-	ELETYPE_TEXT,	//!< Text
-	ELETYPE_IMAGE,	//!< Image
-	
-	ELETYPE_SPACER,	//!< Visual Spacer
-	
-	MAX_ELETYPES	= 0x100
-};
-
-// === FUNCTIONS ===
-/**
- * \brief Create a new element as a child of \a Parent
- */
-extern tElement	*WM_CreateElement(tElement *Parent, int Type, int Flags);
-extern void	WM_SetFlags(tElement *Element, int Flags);
-extern void	WM_SetSize(tElement *Element, int Size);
-extern void	WM_SetText(tElement *Element, char *Text);
-
 #endif