except: pass
else: obj.Connect(theID, -1, event, cb)
-## def _StdWindowCallbacks(win):
-## _checkForCallback(win, "OnChar", wxEVT_CHAR)
-## _checkForCallback(win, "OnSize", wxEVT_SIZE)
-## _checkForCallback(win, "OnEraseBackground", wxEVT_ERASE_BACKGROUND)
-## _checkForCallback(win, "OnSysColourChanged", wxEVT_SYS_COLOUR_CHANGED)
-## _checkForCallback(win, "OnInitDialog", wxEVT_INIT_DIALOG)
-## _checkForCallback(win, "OnPaint", wxEVT_PAINT)
-## _checkForCallback(win, "OnIdle", wxEVT_IDLE)
-
-
-## def _StdFrameCallbacks(win):
-## _StdWindowCallbacks(win)
-## _checkForCallback(win, "OnActivate", wxEVT_ACTIVATE)
-## _checkForCallback(win, "OnMenuHighlight", wxEVT_MENU_HIGHLIGHT)
-## _checkForCallback(win, "OnCloseWindow", wxEVT_CLOSE_WINDOW)
-
-
-## def _StdDialogCallbacks(win):
-## _StdWindowCallbacks(win)
-## _checkForCallback(win, "OnOk", wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK)
-## _checkForCallback(win, "OnApply", wxEVT_COMMAND_BUTTON_CLICKED, wxID_APPLY)
-## _checkForCallback(win, "OnCancel", wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL)
-## _checkForCallback(win, "OnCloseWindow", wxEVT_CLOSE_WINDOW)
-## _checkForCallback(win, "OnCharHook", wxEVT_CHAR_HOOK)
-
-
-## def _StdOnScrollCallbacks(win):
-## try: cb = getattr(win, "OnScroll")
-## except: pass
-## else: EVT_SCROLL(win, cb)
-
-
#----------------------------------------------------------------------
#----------------------------------------------------------------------
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func)
-## # wxGrid *** THE OLD ONE ***
-## def EVT_GRID_SELECT_CELL(win, fn):
-## win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
-
-## def EVT_GRID_CREATE_CELL(win, fn):
-## win.Connect(-1, -1, wxEVT_GRID_CREATE_CELL, fn)
-
-## def EVT_GRID_CHANGE_LABELS(win, fn):
-## win.Connect(-1, -1, wxEVT_GRID_CHANGE_LABELS, fn)
-
-## def EVT_GRID_CHANGE_SEL_LABEL(win, fn):
-## win.Connect(-1, -1, wxEVT_GRID_CHANGE_SEL_LABEL, fn)
-
-## def EVT_GRID_CELL_CHANGE(win, fn):
-## win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn)
-
-## def EVT_GRID_CELL_LCLICK(win, fn):
-## win.Connect(-1, -1, wxEVT_GRID_CELL_LCLICK, fn)
-
-## def EVT_GRID_CELL_RCLICK(win, fn):
-## win.Connect(-1, -1, wxEVT_GRID_CELL_RCLICK, fn)
-
-## def EVT_GRID_LABEL_LCLICK(win, fn):
-## win.Connect(-1, -1, wxEVT_GRID_LABEL_LCLICK, fn)
-
-## def EVT_GRID_LABEL_RCLICK(win, fn):
-## win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn)
-
-
# wxSashWindow
def EVT_SASH_DRAGGED(win, id, func):
win.Connect(id, -1, wxEVT_SASH_DRAGGED, func)
def EVT_LIST_ITEM_SELECTED(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_SELECTED, func)
-def EVT_LIST_ITEM_ACTIVATED(win, id, func):
- win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_ACTIVATED, func)
-
def EVT_LIST_ITEM_DESELECTED(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_DESELECTED, func)
def EVT_LIST_ITEM_MIDDLE_CLICK(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, func)
+def EVT_LIST_ITEM_ACTIVATED(win, id, func):
+ win.Connect(id, -1, wxEVT_COMMAND_LIST_ITEM_ACTIVATED, func)
+
+
#wxSplitterWindow
def EVT_TIMER(win, id, func):
win.Connect(id, -1, wxEVT_TIMER, func)
+# wxProcess
+def EVT_END_PROCESS(eh, id, func):
+ eh.Connect(id, -1, wxEVT_END_PROCESS, func)
+# wxJoyStick
+def EVT_JOY_DOWN(win, func):
+ win.Connect(-1, -1, wxEVT_JOY_DOWN, func)
+
+def EVT_JOY_UP(win, func):
+ win.Connect(-1, -1, wxEVT_JOY_UP, func)
+
+def EVT_JOY_MOVE(win, func):
+ win.Connect(-1, -1, wxEVT_JOY_MOVE, func)
+
+def EVT_JOY_ZMOVE(win, func):
+ win.Connect(-1, -1, wxEVT_JOY_ZMOVE, func)
+
+def EVT_JOYSTICK_EVENTS(win, func):
+ win.Connect(-1, -1, wxEVT_JOY_DOWN, func)
+ win.Connect(-1, -1, wxEVT_JOY_UP, func)
+ win.Connect(-1, -1, wxEVT_JOY_MOVE, func)
+ win.Connect(-1, -1, wxEVT_JOY_ZMOVE, func)
+
#----------------------------------------------------------------------
class wxTimer(wxPyTimer):
- def __init__(self):
- wxPyTimer.__init__(self, self.Notify) # derived class must provide
- # Notify(self) method.
+ def __init__(self, evtHandler = None, id = -1):
+ if evtHandler is None:
+ wxPyTimer.__init__(self, self.Notify) # derived class must provide
+ # Notify(self) method.
+ else:
+ wxPyTimer.__init__(self, None)
+ self.SetOwner(evtHandler, id)
#----------------------------------------------------------------------
# Some wxWin methods can take "NULL" as parameters, but the shadow classes
# expect an object with the SWIG pointer as a 'this' member. This class
# and instance fools the shadow into passing the NULL pointer.
-class NullObj:
+## NOTE: This is not needed anymore as None can be passed instead and
+# will be interpreted as NULL.
+
+class _NullObj:
this = 'NULL' # SWIG converts this to (void*)0
-NULL = NullObj()
+NULL = _NullObj()
#----------------------------------------------------------------------
wxColor = wxColour
wxNamedColor = wxNamedColour
-wxPyDefaultPosition.Set(-1,-1)
-wxPyDefaultSize.Set(-1,-1)
-
-# aliases so that C++ documentation applies:
-wxDefaultPosition = wxPyDefaultPosition
-wxDefaultSize = wxPyDefaultSize
# backwards compatibility
-wxNoRefBitmap = wxBitmap
+wxNoRefBitmap = wxBitmap
+wxPyDefaultPosition = wxDefaultPosition
+wxPyDefaultSize = wxDefaultSize
#----------------------------------------------------------------------
# This helper function will take a wxPython object and convert it to
#
def wxPyTypeCast(obj, typeStr):
+ if obj is None:
+ return None
if hasattr(obj, "this"):
newPtr = ptrcast(obj.this, typeStr+"_p")
else:
return theObj
+#----------------------------------------------------------------------
#----------------------------------------------------------------------
class wxPyOnDemandOutputWindow:
def __init__(self, title = "wxPython: stdout/stderr"):
self.frame = None
self.title = title
-
+ self.parent = None
def SetParent(self, parent):
self.parent = parent
-
def OnCloseWindow(self, event):
if self.frame != None:
self.frame.Destroy()
self.frame = None
self.text = None
-
- # this provides the file-like behaviour
+ # These methods provide the file-like output behaviour.
def write(self, str):
+ if not wxThread_IsMain():
+ # Aquire the GUI mutex before making GUI calls. Mutex is released
+ # when locker is deleted at the end of this function.
+ locker = wxMutexGuiLocker()
+
if not self.frame:
- self.frame = wxFrame(self.parent, -1, self.title)
+ self.frame = wxFrame(self.parent, -1, self.title,
+ style=wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)
self.text = wxTextCtrl(self.frame, -1, "",
style = wxTE_MULTILINE|wxTE_READONLY)
self.frame.SetSize(wxSize(450, 300))
EVT_CLOSE(self.frame, self.OnCloseWindow)
self.text.AppendText(str)
-
def close(self):
if self.frame != None:
- self.frame.Destroy()
- self.frame = None
- self.text = None
-
+ if not wxThread_IsMain():
+ locker = wxMutexGuiLocker()
+ self.frame.Close()
_defRedirect = (wxPlatform == '__WXMSW__')
def SetTopWindow(self, frame):
if self.stdioWin:
self.stdioWin.SetParent(frame)
- sys.stderr = sys.stdout = self.stdioWin
wxPyApp.SetTopWindow(self, frame)
sys.stdout = sys.stderr = open(filename, 'a')
else:
self.stdioWin = self.outputWindowClass() # wxPyOnDemandOutputWindow
+ sys.stdout = sys.stderr = self.stdioWin
def RestoreStdio(self):
sys.stdout, sys.stderr = self.saveStdio
- if self.stdioWin != None:
- self.stdioWin.close()
+
#----------------------------------------------------------------------------
class wxPySimpleApp(wxApp):
- def __init__(self):
- wxApp.__init__(self, 0)
+ def __init__(self, flag=0):
+ wxApp.__init__(self, flag)
def OnInit(self):
return true
__cleanMeUp = __wxPyCleanup()
#----------------------------------------------------------------------------
-
-
-
projects / wxWidgets.git / blobdiff