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://git.ucc.asn.au/tpg/acess2
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin4_src
/
Server
/
CClient.cpp
diff --git
a/Usermode/Applications/axwin4_src/Server/CClient.cpp
b/Usermode/Applications/axwin4_src/Server/CClient.cpp
index
8640bf3
..
2abcb9b
100644
(file)
--- a/
Usermode/Applications/axwin4_src/Server/CClient.cpp
+++ b/
Usermode/Applications/axwin4_src/Server/CClient.cpp
@@
-8,6
+8,7
@@
#include <CClient.hpp>
#include <IIPCChannel.hpp>
#include <ipc.hpp>
#include <CClient.hpp>
#include <IIPCChannel.hpp>
#include <ipc.hpp>
+#include <draw_text.hpp> // for the fonts
namespace AxWin {
namespace AxWin {
@@
-35,7
+36,7
@@
CWindow* CClient::GetWindow(int ID)
void CClient::SetWindow(int ID, CWindow* window)
{
void CClient::SetWindow(int ID, CWindow* window)
{
- _SysDebug("SetWindow(ID=%i,window=%p)", ID, window);
+
//
_SysDebug("SetWindow(ID=%i,window=%p)", ID, window);
auto it = m_windows.find(ID);
if( it != m_windows.end() ) {
_SysDebug("CLIENT BUG: Window ID %i is already used by %p", ID, it->second);
auto it = m_windows.find(ID);
if( it != m_windows.end() ) {
_SysDebug("CLIENT BUG: Window ID %i is already used by %p", ID, it->second);
@@
-45,6
+46,16
@@
void CClient::SetWindow(int ID, CWindow* window)
}
}
}
}
+IFontFace& CClient::GetFont(unsigned int id)
+{
+ static CFontFallback fallback_font;
+ if( id == 0 ) {
+ _SysDebug("GetFont: %i = %p", id, &fallback_font);
+ return fallback_font;
+ }
+ assert(!"TODO: CClient::GetFont id != 0");
+}
+
void CClient::HandleMessage(CDeserialiser& message)
{
try {
void CClient::HandleMessage(CDeserialiser& message)
{
try {
UCC
git Repository :: git.ucc.asn.au