Merge branch 'master' of github.com:thepowersgang/acess2

[tpg/acess2.git] / Usermode / Applications / axwin4_src / Server / include / CClient.hpp

diff --git a/Usermode/Applications/axwin4_src/Server/include/CClient.hpp b/Usermode/Applications/axwin4_src/Server/include/CClient.hpp
index 6e8a09b..2a23f15 100644 (file)
--- a/Usermode/Applications/axwin4_src/Server/include/CClient.hpp
+++ b/Usermode/Applications/axwin4_src/Server/include/CClient.hpp
@@ -10,6 +10,9 @@
 
 #include "CWindow.hpp"
 #include "serialisation.hpp"
+#include <map>
+#include <cassert>
+#include "IFontFace.hpp"
 
 namespace AxWin {
 
@@ -17,17 +20,23 @@ class IIPCChannel;
 
 class CClient
 {
+       unsigned int    m_id;
        IIPCChannel&    m_channel;
        
-       //::std::map<unsigned int,CWindow*>     m_windows;
-       CWindow*        m_windows[1];
+       ::std::map<unsigned int,CWindow*>       m_windows;
+       //CWindow*      m_windows[1];
 public:
        CClient(::AxWin::IIPCChannel& channel);
        virtual ~CClient();
        
+       void set_id(unsigned int id) { assert(m_id == 0); m_id = id; }
+       unsigned int id() const { return m_id; }
+       
        CWindow*        GetWindow(int ID);
        void    SetWindow(int ID, CWindow* window);
        
+       IFontFace&      GetFont(unsigned int id);
+       
        virtual void    SendMessage(CSerialiser& reply) = 0;
        void    HandleMessage(CDeserialiser& message);
 };