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
Usermode/AxWin3 - Cleaning up and adding client widget support
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin3_src
/
libaxwin3.so_src
/
wm.c
diff --git
a/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
b/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
index
9f15ad7
..
e0cfcbe
100644
(file)
--- a/
Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
+++ b/
Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
@@
-8,8
+8,8
@@
#include <axwin3/axwin.h>
#include <stdlib.h>
#include <string.h>
#include <axwin3/axwin.h>
#include <stdlib.h>
#include <string.h>
-#include "include/ipc.h"
#include "include/internal.h"
#include "include/internal.h"
+#include "include/ipc.h"
#define WINDOWS_PER_ALLOC (63)
#define WINDOWS_PER_ALLOC (63)
@@
-79,9
+79,8
@@
tWindow *AxWin3_int_AllocateWindowInfo(int DataBytes, int *WinID)
}
tHWND AxWin3_CreateWindow(
}
tHWND AxWin3_CreateWindow(
- tHWND Parent, const char *Renderer, int Flags,
- int DataBytes, void **DataPtr,
- tAxWin3_WindowMessageHandler MessageHandler
+ tHWND Parent, const char *Renderer, int RendererArg,
+ int DataBytes, tAxWin3_WindowMessageHandler MessageHandler
)
{
tWindow *ret;
)
{
tWindow *ret;
@@
-99,7
+98,7
@@
tHWND AxWin3_CreateWindow(
msg = AxWin3_int_AllocateIPCMessage(Parent, IPCMSG_CREATEWIN, 0, dataSize);
create_win = (void*)msg->Data;
create_win->NewWinID = newWinID;
msg = AxWin3_int_AllocateIPCMessage(Parent, IPCMSG_CREATEWIN, 0, dataSize);
create_win = (void*)msg->Data;
create_win->NewWinID = newWinID;
- create_win->
Flags = Flags
;
+ create_win->
RendererArg = RendererArg
;
strcpy(create_win->Renderer, Renderer);
// Send and clean up
strcpy(create_win->Renderer, Renderer);
// Send and clean up
@@
-109,7
+108,6
@@
tHWND AxWin3_CreateWindow(
// TODO: Detect and handle possible errors
// Return success
// TODO: Detect and handle possible errors
// Return success
- if(DataPtr) *DataPtr = ret->Data;
return ret;
}
return ret;
}
@@
-122,6
+120,11
@@
void AxWin3_DestroyWindow(tHWND Window)
free(msg);
}
free(msg);
}
+void *AxWin3_int_GetDataPtr(tHWND Window)
+{
+ return &Window->Data;
+}
+
void AxWin3_ShowWindow(tHWND Window, int bShow)
{
tAxWin_IPCMessage *msg;
void AxWin3_ShowWindow(tHWND Window, int bShow)
{
tAxWin_IPCMessage *msg;
UCC
git Repository :: git.ucc.asn.au