RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

explicit window_handle type, for mac

This commit is contained in:
David Rose 2009-11-18 19:50:17 +00:00
parent 88eea6be3a
commit 8c3d9c16f9
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
direct/src/plugin/p3dInstance.cxx
View File

@ -814,7 +814,9 @@ handle_event(P3D_event_data event) {
// Need to ensure we have the correct port set, in order to
// convert the mouse coordinates successfully via
// GlobalToLocal().
GrafPtr out_port = _wparams.get_parent_window()._port;
const P3D_window_handle &handle = _wparams.get_parent_window();
assert(handle._window_handle_type == P3D_WHT_osx_port);
GrafPtr out_port = handle._handle._osx_port._port;
GrafPtr port_save = NULL;
Boolean port_changed = QDSwapPort(out_port, &port_save);
@ -2867,7 +2869,9 @@ paint_window() {
return;
}
GrafPtr out_port = _wparams.get_parent_window()._port;
const P3D_window_handle &handle = _wparams.get_parent_window();
assert(handle._window_handle_type == P3D_WHT_osx_port);
GrafPtr out_port = handle._handle._osx_port._port;
GrafPtr port_save = NULL;
Boolean port_changed = QDSwapPort(out_port, &port_save);

14
direct/src/plugin/p3dOsxSplashWindow.cxx
View File

@ -207,7 +207,9 @@ handle_event(P3D_event_data event) {
// Need to ensure we have the correct port set, in order to
// convert the mouse coordinates successfully via
// GlobalToLocal().
GrafPtr out_port = _wparams.get_parent_window()._port;
const P3D_window_handle &handle = _wparams.get_parent_window();
assert(handle._window_handle_type == P3D_WHT_osx_port);
GrafPtr out_port = handle._handle._osx_port._port;
GrafPtr port_save = NULL;
Boolean port_changed = QDSwapPort(out_port, &port_save);
@ -281,7 +283,9 @@ paint_window() {
GetPort(&out_port);
} else {
out_port = _wparams.get_parent_window()._port;
const P3D_window_handle &handle = _wparams.get_parent_window();
assert(handle._window_handle_type == P3D_WHT_osx_port);
out_port = handle._handle._osx_port._port;
}
CGContextRef context;
@ -639,9 +643,13 @@ event_callback(EventHandlerCallRef my_handler, EventRef event) {
GetEventParameter(event, kEventParamMouseLocation, typeQDPoint, NULL,
sizeof(Point), NULL, (void *)&point);
GrafPtr port = _wparams.get_parent_window()._port;
GrafPtr port;
if (_toplevel_window != NULL) {
port = GetWindowPort(_toplevel_window);
} else {
const P3D_window_handle &handle = _wparams.get_parent_window();
assert(handle._window_handle_type == P3D_WHT_osx_port);
port = handle._handle._osx_port._port;
}
GrafPtr port_save = NULL;
Boolean port_changed = QDSwapPort(port, &port_save);

6
direct/src/plugin_npapi/ppInstance.cxx
View File

@ -1308,7 +1308,8 @@ send_window() {
#elif defined(__APPLE__)
NP_Port *port = (NP_Port *)_window.window;
parent_window._port = port->port;
parent_window._window_handle_type = P3D_WHT_osx_port;
parent_window._handle._osx_port._port = port->port;
/*
NP_CGContext *context = (NP_CGContext *)_window.window;
parent_window._context = context->context;
@ -1337,7 +1338,8 @@ send_window() {
#elif defined(__APPLE__)
NP_Port *port = (NP_Port *)_window.window;
parent_window._port = port->port;
parent_window._window_handle_type = P3D_WHT_osx_port;
parent_window._handle._osx_port._port = port->port;
/*
NP_CGContext *context = (NP_CGContext *)_window.window;
parent_window._context = context->context;