X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Fwm.h;h=5977fd689a3459b6834c58350955d7a1b5c3d31e;hb=e02f66c7125bf18f77c6c53587238cbd49da2c89;hp=df4f860c4b9752e03a2956771658a61446561772;hpb=8a8b0b1479008b969fee392b26f39e1f2cd62960;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/wm.h b/Usermode/Applications/axwin2_src/WM/wm.h
index df4f860c..5977fd68 100644
--- a/Usermode/Applications/axwin2_src/WM/wm.h
+++ b/Usermode/Applications/axwin2_src/WM/wm.h
@@ -15,6 +15,7 @@
 #define DEFAULT_ELEMENTS_PER_APP	128
 
 typedef struct sAxWin_Element	tElement;
+typedef struct sMenuItem	tMenuItem;
 typedef struct sWindow	tWindow;
 typedef struct sApplication	tApplication;
 
@@ -57,14 +58,28 @@ struct sAxWin_Element
 	char	DebugName[];
 };
 
+struct sMenuItem
+{
+	tMenuItem	*Next;
+	 int	Flags;
+	 int	ID;	//!< ID number sent to application
+	const char	*Label;
+	const char	*Right;
+	tMenuItem	*FirstChild;
+};
+
 struct sWindow
 {
 	 int	X, Y, W, H;
-	tImage	*Icon;
+	void	*Icon;
+	
+	tApplication	*App;
 	
 	tWindow	*OrderNext;	// Render order
 	
-	tElement	Element;
+	tMenuItem	*Menus;
+	
+	tElement	RootElement;
 };
 
 struct sApplication
@@ -79,7 +94,7 @@ struct sApplication
 	 int	MaxElementIndex;	//!< Number of entries in \a EleIndex
 	tElement	**EleIndex;	//!< Array of pointers to elements owned by this application
 	
-	tElement	MetaElement;	//!< Windows child off this
+	tElement	MetaElement;	//!< Tabs child off this
 };
 
 // === FUNCTIONS ===