Author: tack
Date: Tue Jan 16 15:47:25 2007
New Revision: 2408
Modified:
trunk/display/src/x11.py
trunk/display/src/x11window.c
trunk/display/src/x11window.h
Log:
ptr is a misnomer because it is not a pointer.
Modified: trunk/display/src/x11.py
==============================================================================
--- trunk/display/src/x11.py (original)
+++ trunk/display/src/x11.py Tue Jan 16 15:47:25 2007
@@ -220,7 +220,7 @@
self._window = _X11.X11Window(display._display, kwargs["size"],
**kwargs)
self._display = display
- display._windows[self._window.ptr] = weakref.ref(self)
+ display._windows[self._window.wid] = weakref.ref(self)
self._cursor_hide_timeout = -1
self._cursor_hide_timer =
kaa.notifier.WeakOneShotTimer(self._cursor_hide_cb)
self._cursor_visible = True
@@ -377,7 +377,7 @@
return self._fs_size_save != None
def get_id(self):
- return self._window.ptr
+ return self._window.wid
def focus(self):
return self._window.focus()
Modified: trunk/display/src/x11window.c
==============================================================================
--- trunk/display/src/x11window.c (original)
+++ trunk/display/src/x11window.c Tue Jan 16 15:47:25 2007
@@ -138,7 +138,7 @@
if (window_title)
XStoreName(self->display, self->window, window_title);
}
- self->ptr = PyInt_FromLong(self->window);
+ self->wid = PyInt_FromLong(self->window);
_make_invisible_cursor(self);
XUnlockDisplay(self->display);
return (PyObject *)self;
@@ -158,7 +158,7 @@
if (self->window) {
XLockDisplay(self->display);
XDestroyWindow(self->display, self->window);
- Py_XDECREF(self->ptr);
+ Py_XDECREF(self->wid);
XFreeCursor(self->display, self->invisible_cursor);
XUnlockDisplay(self->display);
}
@@ -327,7 +327,7 @@
Py_INCREF(display);
o->display = ((X11Display_PyObject *)display)->display;
o->window = window;
- o->ptr = PyInt_FromLong(window);
+ o->wid = PyInt_FromLong(window);
XLockDisplay(o->display);
_make_invisible_cursor(o);
XUnlockDisplay(o->display);
@@ -366,7 +366,7 @@
static PyMemberDef X11Window_PyObject_members[] = {
- {"ptr", T_OBJECT_EX, offsetof(X11Window_PyObject, ptr), 0, ""},
+ {"wid", T_OBJECT_EX, offsetof(X11Window_PyObject, wid), 0, ""},
{NULL} /* Sentinel */
};
Modified: trunk/display/src/x11window.h
==============================================================================
--- trunk/display/src/x11window.h (original)
+++ trunk/display/src/x11window.h Tue Jan 16 15:47:25 2007
@@ -48,7 +48,7 @@
Window window;
Cursor invisible_cursor;
- PyObject *ptr;
+ PyObject *wid;
} X11Window_PyObject;
extern PyTypeObject X11Window_PyObject_Type;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
