git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://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
a42d9fa
..
2a23f15
100644
(file)
--- a/
Usermode/Applications/axwin4_src/Server/include/CClient.hpp
+++ b/
Usermode/Applications/axwin4_src/Server/include/CClient.hpp
@@
-11,6
+11,8
@@
#include "CWindow.hpp"
#include "serialisation.hpp"
#include <map>
#include "CWindow.hpp"
#include "serialisation.hpp"
#include <map>
+#include <cassert>
+#include "IFontFace.hpp"
namespace AxWin {
namespace AxWin {
@@
-18,6
+20,7
@@
class IIPCChannel;
class CClient
{
class CClient
{
+ unsigned int m_id;
IIPCChannel& m_channel;
::std::map<unsigned int,CWindow*> m_windows;
IIPCChannel& m_channel;
::std::map<unsigned int,CWindow*> m_windows;
@@
-26,9
+29,14
@@
public:
CClient(::AxWin::IIPCChannel& channel);
virtual ~CClient();
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);
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);
};
virtual void SendMessage(CSerialiser& reply) = 0;
void HandleMessage(CDeserialiser& message);
};
UCC
git Repository :: git.ucc.asn.au