return val
def GetTopWindow(self, *_args, **_kwargs):
val = apply(wxc.wxPyApp_GetTopWindow,(self,) + _args, _kwargs)
- if val: val = wxWindowPtr(val)
return val
def GetVendorName(self, *_args, **_kwargs):
val = apply(wxc.wxPyApp_GetVendorName,(self,) + _args, _kwargs)
wxRESIZE_BORDER = wxc.wxRESIZE_BORDER
wxDIALOG_MODAL = wxc.wxDIALOG_MODAL
wxDIALOG_MODELESS = wxc.wxDIALOG_MODELESS
+wxDIALOG_NO_PARENT = wxc.wxDIALOG_NO_PARENT
wxDEFAULT_FRAME_STYLE = wxc.wxDEFAULT_FRAME_STYLE
wxDEFAULT_DIALOG_STYLE = wxc.wxDEFAULT_DIALOG_STYLE
wxFRAME_TOOL_WINDOW = wxc.wxFRAME_TOOL_WINDOW
wxFRAME_FLOAT_ON_PARENT = wxc.wxFRAME_FLOAT_ON_PARENT
wxFRAME_NO_WINDOW_MENU = wxc.wxFRAME_NO_WINDOW_MENU
wxFRAME_NO_TASKBAR = wxc.wxFRAME_NO_TASKBAR
-wxFRAME_EX_CONTEXTHELP = wxc.wxFRAME_EX_CONTEXTHELP
wxED_CLIENT_MARGIN = wxc.wxED_CLIENT_MARGIN
wxED_BUTTONS_BOTTOM = wxc.wxED_BUTTONS_BOTTOM
wxED_BUTTONS_RIGHT = wxc.wxED_BUTTONS_RIGHT
wxED_STATIC_LINE = wxc.wxED_STATIC_LINE
wxEXT_DIALOG_STYLE = wxc.wxEXT_DIALOG_STYLE
wxCLIP_CHILDREN = wxc.wxCLIP_CHILDREN
+wxCLIP_SIBLINGS = wxc.wxCLIP_SIBLINGS
wxRETAINED = wxc.wxRETAINED
wxBACKINGSTORE = wxc.wxBACKINGSTORE
wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS
wxTR_MULTIPLE = wxc.wxTR_MULTIPLE
wxTR_SINGLE = wxc.wxTR_SINGLE
wxTR_HAS_VARIABLE_ROW_HEIGHT = wxc.wxTR_HAS_VARIABLE_ROW_HEIGHT
-wxLC_ICON = wxc.wxLC_ICON
-wxLC_SMALL_ICON = wxc.wxLC_SMALL_ICON
-wxLC_LIST = wxc.wxLC_LIST
-wxLC_REPORT = wxc.wxLC_REPORT
-wxLC_ALIGN_TOP = wxc.wxLC_ALIGN_TOP
-wxLC_ALIGN_LEFT = wxc.wxLC_ALIGN_LEFT
-wxLC_AUTOARRANGE = wxc.wxLC_AUTOARRANGE
-wxLC_USER_TEXT = wxc.wxLC_USER_TEXT
-wxLC_EDIT_LABELS = wxc.wxLC_EDIT_LABELS
-wxLC_NO_HEADER = wxc.wxLC_NO_HEADER
-wxLC_NO_SORT_HEADER = wxc.wxLC_NO_SORT_HEADER
-wxLC_SINGLE_SEL = wxc.wxLC_SINGLE_SEL
-wxLC_SORT_ASCENDING = wxc.wxLC_SORT_ASCENDING
-wxLC_SORT_DESCENDING = wxc.wxLC_SORT_DESCENDING
-wxLC_MASK_TYPE = wxc.wxLC_MASK_TYPE
-wxLC_MASK_ALIGN = wxc.wxLC_MASK_ALIGN
-wxLC_MASK_SORT = wxc.wxLC_MASK_SORT
-wxLC_HRULES = wxc.wxLC_HRULES
-wxLC_VRULES = wxc.wxLC_VRULES
wxSP_VERTICAL = wxc.wxSP_VERTICAL
wxSP_HORIZONTAL = wxc.wxSP_HORIZONTAL
wxSP_ARROW_KEYS = wxc.wxSP_ARROW_KEYS
wxID_PASTE = wxc.wxID_PASTE
wxID_CLEAR = wxc.wxID_CLEAR
wxID_FIND = wxc.wxID_FIND
+wxID_DUPLICATE = wxc.wxID_DUPLICATE
+wxID_SELECTALL = wxc.wxID_SELECTALL
wxID_FILE1 = wxc.wxID_FILE1
wxID_FILE2 = wxc.wxID_FILE2
wxID_FILE3 = wxc.wxID_FILE3
wxID_NO = wxc.wxID_NO
wxID_STATIC = wxc.wxID_STATIC
wxID_SEPARATOR = wxc.wxID_SEPARATOR
-wxBITMAP_TYPE_BMP = wxc.wxBITMAP_TYPE_BMP
-wxBITMAP_TYPE_BMP_RESOURCE = wxc.wxBITMAP_TYPE_BMP_RESOURCE
-wxBITMAP_TYPE_ICO = wxc.wxBITMAP_TYPE_ICO
-wxBITMAP_TYPE_ICO_RESOURCE = wxc.wxBITMAP_TYPE_ICO_RESOURCE
-wxBITMAP_TYPE_CUR = wxc.wxBITMAP_TYPE_CUR
-wxBITMAP_TYPE_CUR_RESOURCE = wxc.wxBITMAP_TYPE_CUR_RESOURCE
-wxBITMAP_TYPE_XBM = wxc.wxBITMAP_TYPE_XBM
-wxBITMAP_TYPE_XBM_DATA = wxc.wxBITMAP_TYPE_XBM_DATA
-wxBITMAP_TYPE_XPM = wxc.wxBITMAP_TYPE_XPM
-wxBITMAP_TYPE_XPM_DATA = wxc.wxBITMAP_TYPE_XPM_DATA
-wxBITMAP_TYPE_TIF = wxc.wxBITMAP_TYPE_TIF
-wxBITMAP_TYPE_TIF_RESOURCE = wxc.wxBITMAP_TYPE_TIF_RESOURCE
-wxBITMAP_TYPE_GIF = wxc.wxBITMAP_TYPE_GIF
-wxBITMAP_TYPE_GIF_RESOURCE = wxc.wxBITMAP_TYPE_GIF_RESOURCE
-wxBITMAP_TYPE_PNG = wxc.wxBITMAP_TYPE_PNG
-wxBITMAP_TYPE_PNG_RESOURCE = wxc.wxBITMAP_TYPE_PNG_RESOURCE
-wxBITMAP_TYPE_ANY = wxc.wxBITMAP_TYPE_ANY
-wxBITMAP_TYPE_RESOURCE = wxc.wxBITMAP_TYPE_RESOURCE
-wxBITMAP_TYPE_JPEG = wxc.wxBITMAP_TYPE_JPEG
-wxBITMAP_TYPE_PCX = wxc.wxBITMAP_TYPE_PCX
+wxID_FORWARD = wxc.wxID_FORWARD
+wxID_BACKWARD = wxc.wxID_BACKWARD
+wxID_SETUP = wxc.wxID_SETUP
+wxID_MORE = wxc.wxID_MORE
wxOPEN = wxc.wxOPEN
wxSAVE = wxc.wxSAVE
wxHIDE_READONLY = wxc.wxHIDE_READONLY
wxNB_LEFT = wxc.wxNB_LEFT
wxNB_RIGHT = wxc.wxNB_RIGHT
wxNB_BOTTOM = wxc.wxNB_BOTTOM
+wxNB_MULTILINE = wxc.wxNB_MULTILINE
wxLI_HORIZONTAL = wxc.wxLI_HORIZONTAL
wxLI_VERTICAL = wxc.wxLI_VERTICAL
wxHW_SCROLLBAR_NEVER = wxc.wxHW_SCROLLBAR_NEVER
wxJOY_BUTTON3 = wxc.wxJOY_BUTTON3
wxJOY_BUTTON4 = wxc.wxJOY_BUTTON4
wxJOY_BUTTON_ANY = wxc.wxJOY_BUTTON_ANY
+wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY
wxDEFAULT = wxc.wxDEFAULT
wxDECORATIVE = wxc.wxDECORATIVE
wxROMAN = wxc.wxROMAN
WXK_SCROLL = wxc.WXK_SCROLL
WXK_PAGEUP = wxc.WXK_PAGEUP
WXK_PAGEDOWN = wxc.WXK_PAGEDOWN
+wxBITMAP_TYPE_INVALID = wxc.wxBITMAP_TYPE_INVALID
+wxBITMAP_TYPE_BMP = wxc.wxBITMAP_TYPE_BMP
+wxBITMAP_TYPE_BMP_RESOURCE = wxc.wxBITMAP_TYPE_BMP_RESOURCE
+wxBITMAP_TYPE_RESOURCE = wxc.wxBITMAP_TYPE_RESOURCE
+wxBITMAP_TYPE_ICO = wxc.wxBITMAP_TYPE_ICO
+wxBITMAP_TYPE_ICO_RESOURCE = wxc.wxBITMAP_TYPE_ICO_RESOURCE
+wxBITMAP_TYPE_CUR = wxc.wxBITMAP_TYPE_CUR
+wxBITMAP_TYPE_CUR_RESOURCE = wxc.wxBITMAP_TYPE_CUR_RESOURCE
+wxBITMAP_TYPE_XBM = wxc.wxBITMAP_TYPE_XBM
+wxBITMAP_TYPE_XBM_DATA = wxc.wxBITMAP_TYPE_XBM_DATA
+wxBITMAP_TYPE_XPM = wxc.wxBITMAP_TYPE_XPM
+wxBITMAP_TYPE_XPM_DATA = wxc.wxBITMAP_TYPE_XPM_DATA
+wxBITMAP_TYPE_TIF = wxc.wxBITMAP_TYPE_TIF
+wxBITMAP_TYPE_TIF_RESOURCE = wxc.wxBITMAP_TYPE_TIF_RESOURCE
+wxBITMAP_TYPE_GIF = wxc.wxBITMAP_TYPE_GIF
+wxBITMAP_TYPE_GIF_RESOURCE = wxc.wxBITMAP_TYPE_GIF_RESOURCE
+wxBITMAP_TYPE_PNG = wxc.wxBITMAP_TYPE_PNG
+wxBITMAP_TYPE_PNG_RESOURCE = wxc.wxBITMAP_TYPE_PNG_RESOURCE
+wxBITMAP_TYPE_JPEG = wxc.wxBITMAP_TYPE_JPEG
+wxBITMAP_TYPE_JPEG_RESOURCE = wxc.wxBITMAP_TYPE_JPEG_RESOURCE
+wxBITMAP_TYPE_PNM = wxc.wxBITMAP_TYPE_PNM
+wxBITMAP_TYPE_PNM_RESOURCE = wxc.wxBITMAP_TYPE_PNM_RESOURCE
+wxBITMAP_TYPE_PCX = wxc.wxBITMAP_TYPE_PCX
+wxBITMAP_TYPE_PCX_RESOURCE = wxc.wxBITMAP_TYPE_PCX_RESOURCE
+wxBITMAP_TYPE_PICT = wxc.wxBITMAP_TYPE_PICT
+wxBITMAP_TYPE_PICT_RESOURCE = wxc.wxBITMAP_TYPE_PICT_RESOURCE
+wxBITMAP_TYPE_ICON = wxc.wxBITMAP_TYPE_ICON
+wxBITMAP_TYPE_ICON_RESOURCE = wxc.wxBITMAP_TYPE_ICON_RESOURCE
+wxBITMAP_TYPE_MACCURSOR = wxc.wxBITMAP_TYPE_MACCURSOR
+wxBITMAP_TYPE_MACCURSOR_RESOURCE = wxc.wxBITMAP_TYPE_MACCURSOR_RESOURCE
+wxBITMAP_TYPE_ANY = wxc.wxBITMAP_TYPE_ANY
wxCURSOR_NONE = wxc.wxCURSOR_NONE
wxCURSOR_ARROW = wxc.wxCURSOR_ARROW
wxCURSOR_BULLSEYE = wxc.wxCURSOR_BULLSEYE
wxCURSOR_WAIT = wxc.wxCURSOR_WAIT
wxCURSOR_WATCH = wxc.wxCURSOR_WATCH
wxCURSOR_BLANK = wxc.wxCURSOR_BLANK
+wxCURSOR_DEFAULT = wxc.wxCURSOR_DEFAULT
+wxCURSOR_ARROWWAIT = wxc.wxCURSOR_ARROWWAIT
+wxCURSOR_MAX = wxc.wxCURSOR_MAX
wxPAPER_NONE = wxc.wxPAPER_NONE
wxPAPER_LETTER = wxc.wxPAPER_LETTER
wxPAPER_LEGAL = wxc.wxPAPER_LEGAL
wxEVT_COMMAND_TOOL_ENTER = wxc.wxEVT_COMMAND_TOOL_ENTER
wxEVT_SET_FOCUS = wxc.wxEVT_SET_FOCUS
wxEVT_KILL_FOCUS = wxc.wxEVT_KILL_FOCUS
+wxEVT_MOUSEWHEEL = wxc.wxEVT_MOUSEWHEEL
wxEVT_LEFT_DOWN = wxc.wxEVT_LEFT_DOWN
wxEVT_LEFT_UP = wxc.wxEVT_LEFT_UP
wxEVT_MIDDLE_DOWN = wxc.wxEVT_MIDDLE_DOWN
wxEVT_MENU_INIT = wxc.wxEVT_MENU_INIT
wxEVT_MENU_HIGHLIGHT = wxc.wxEVT_MENU_HIGHLIGHT
wxEVT_POPUP_MENU_INIT = wxc.wxEVT_POPUP_MENU_INIT
-wxEVT_CONTEXT_MENU = wxc.wxEVT_CONTEXT_MENU
wxEVT_SYS_COLOUR_CHANGED = wxc.wxEVT_SYS_COLOUR_CHANGED
wxEVT_SETTING_CHANGED = wxc.wxEVT_SETTING_CHANGED
wxEVT_QUERY_NEW_PALETTE = wxc.wxEVT_QUERY_NEW_PALETTE
wxEVT_COMMAND_ENTER = wxc.wxEVT_COMMAND_ENTER
wxEVT_NAVIGATION_KEY = wxc.wxEVT_NAVIGATION_KEY
wxEVT_TIMER = wxc.wxEVT_TIMER
-wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY
__version__ = wxc.__version__
cvar = wxc.cvar
wxDefaultPosition = wxPointPtr(wxc.cvar.wxDefaultPosition)
def EVT_ENTER_WINDOW(win, func):
win.Connect(-1, -1, wxEVT_ENTER_WINDOW, func)
+def EVT_MOUSEWHEEL(win, func):
+ win.Connect(-1, -1, wxEVT_MOUSEWHEEL, func)
# all mouse events
def EVT_MOUSE_EVENTS(win, func):
def EVT_TREE_BEGIN_RDRAG(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_RDRAG, func)
+def EVT_TREE_END_DRAG(win, id, func):
+ win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func)
+
def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func)
# wxJoyStick
def EVT_JOY_DOWN(win, func):
- win.Connect(-1, -1, wxEVT_JOY_DOWN, func)
+ win.Connect(-1, -1, wxEVT_JOY_BUTTON_DOWN, func)
def EVT_JOY_UP(win, func):
- win.Connect(-1, -1, wxEVT_JOY_UP, func)
+ win.Connect(-1, -1, wxEVT_JOY_BUTTON_UP, func)
def EVT_JOY_MOVE(win, func):
win.Connect(-1, -1, wxEVT_JOY_MOVE, 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_BUTTON_DOWN, func)
+ win.Connect(-1, -1, wxEVT_JOY_BUTTON_UP, func)
win.Connect(-1, -1, wxEVT_JOY_MOVE, func)
win.Connect(-1, -1, wxEVT_JOY_ZMOVE, func)
+
+def EVT_TOGGLEBUTTON(win, id, func):
+ win.Connect(id, -1, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, func)
+
+
+
+# Help events
+def EVT_HELP(win, id, func):
+ win.Connect(id, -1, wxEVT_HELP, func)
+
+def EVT_HELP_RANGE(win, id, id2, func):
+ win.Connect(id, id2, wxEVT_HELP, func)
+
+def EVT_DETAILED_HELP(win, id, func):
+ win.Connect(id, -1, wxEVT_DETAILED_HELP, func)
+
+def EVT_DETAILED_HELP_RANGE(win, id, id2, func):
+ win.Connect(id, id2, wxEVT_DETAILED_HELP, func)
+
+def EVT_CONTEXT_MENU(win, func):
+ win.Connect(-1, -1, wxEVT_CONTEXT_MENU, func)
+
+
#----------------------------------------------------------------------
class wxTimer(wxPyTimer):
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.
-## 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 = None # For backwards compatibility only. You should really be
+ # using None now.
#----------------------------------------------------------------------
def wxPyTypeCast(obj, typeStr):
if obj is None:
return None
+ theClass = globals()[typeStr+"Ptr"]
+ typeStr = __wxPyPtrTypeMap.get(typeStr, typeStr)
if hasattr(obj, "this"):
+ if obj.__class__ is theClass: # if already the right type then just return it
+ return obj
newPtr = ptrcast(obj.this, typeStr+"_p")
else:
newPtr = ptrcast(obj, typeStr+"_p")
- theClass = globals()[typeStr+"Ptr"]
theObj = theClass(newPtr)
if hasattr(obj, "this"):
theObj.thisown = obj.thisown
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()
+
#----------------------------------------------------------------------------
self.cleanup()
__cleanMeUp = __wxPyCleanup()
+
+#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff