Usermode/AxWin3 - Added keysyms (symlink to kernel version)

[tpg/acess2.git] / Usermode / Applications / axwin2_src / WM / wm.h

diff --git a/Usermode/Applications/axwin2_src/WM/wm.h b/Usermode/Applications/axwin2_src/WM/wm.h
index ab2a629..5977fd6 100644 (file)
--- a/Usermode/Applications/axwin2_src/WM/wm.h
+++ b/Usermode/Applications/axwin2_src/WM/wm.h
@@ -15,6 +15,8 @@
 #define DEFAULT_ELEMENTS_PER_APP       128
 
 typedef struct sAxWin_Element  tElement;
+typedef struct sMenuItem       tMenuItem;
+typedef struct sWindow tWindow;
 typedef struct sApplication    tApplication;
 
 struct sAxWin_Element
@@ -38,7 +40,7 @@ struct sAxWin_Element
        
        uint32_t        Flags;
        
-       short   FixedWith;      //!< Fixed Long Size attribute (height)
+       short   FixedWith;      //!< Fixed lengthways Size attribute (height)
        short   FixedCross;     //!< Fixed Cross Size attribute (width)
        
        char    *Text;
@@ -56,6 +58,30 @@ 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;
+       void    *Icon;
+       
+       tApplication    *App;
+       
+       tWindow *OrderNext;     // Render order
+       
+       tMenuItem       *Menus;
+       
+       tElement        RootElement;
+};
+
 struct sApplication
 {
        tApplication    *Next;
@@ -68,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 ===