Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-11 13:08:27 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-05-29 21:18:31 +00:00
parent dd74a8f6aa
commit 704eda0cdc
36 changed files with 6681 additions and 2271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/gtk/_controls.py
+169 -10
View File
@@ -2869,6 +2869,15 @@ class BookCtrlBase(_core.Control):
"""AdvanceSelection(self, bool forward=True)"""
return _controls_.BookCtrlBase_AdvanceSelection(*args, **kwargs)
def HitTest(*args, **kwargs):
"""
HitTest(Point pt) -> (tab, where)
Returns the page/tab which is hit, and flags indicating where using
wx.NB_HITTEST flags.
"""
return _controls_.BookCtrlBase_HitTest(*args, **kwargs)
def GetClassDefaultAttributes(*args, **kwargs):
"""
GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -2984,15 +2993,6 @@ class Notebook(BookCtrlBase):
"""SetTabSize(self, Size sz)"""
return _controls_.Notebook_SetTabSize(*args, **kwargs)
def HitTest(*args, **kwargs):
"""
HitTest(Point pt) -> (tab, where)
Returns the tab which is hit, and flags indicating where using
wx.NB_HITTEST flags.
"""
return _controls_.Notebook_HitTest(*args, **kwargs)
def GetThemeBackgroundColour(*args, **kwargs):
"""GetThemeBackgroundColour(self) -> Colour"""
return _controls_.Notebook_GetThemeBackgroundColour(*args, **kwargs)
@@ -3347,6 +3347,7 @@ TB_NODIVIDER = _controls_.TB_NODIVIDER
TB_NOALIGN = _controls_.TB_NOALIGN
TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
class ToolBarToolBase(_core.Object):
"""Proxy of C++ ToolBarToolBase class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -3907,6 +3908,7 @@ LIST_HITTEST_ONITEMSTATEICON = _controls_.LIST_HITTEST_ONITEMSTATEICON
LIST_HITTEST_TOLEFT = _controls_.LIST_HITTEST_TOLEFT
LIST_HITTEST_TORIGHT = _controls_.LIST_HITTEST_TORIGHT
LIST_HITTEST_ONITEM = _controls_.LIST_HITTEST_ONITEM
LIST_GETSUBITEMRECT_WHOLEITEM = _controls_.LIST_GETSUBITEMRECT_WHOLEITEM
LIST_NEXT_ABOVE = _controls_.LIST_NEXT_ABOVE
LIST_NEXT_ALL = _controls_.LIST_NEXT_ALL
LIST_NEXT_BELOW = _controls_.LIST_NEXT_BELOW
@@ -4495,6 +4497,16 @@ class ListCtrl(_core.Control):
"""
return _controls_.ListCtrl_HitTest(*args, **kwargs)
def HitTestSubItem(*args, **kwargs):
"""
HitTestSubItem(Point point) -> (item, where, subItem)
Determines which item (if any) is at the specified point, giving in
the second return value (see wx.LIST_HITTEST flags) and also the subItem, if
any.
"""
return _controls_.ListCtrl_HitTestSubItem(*args, **kwargs)
def InsertItem(*args, **kwargs):
"""InsertItem(self, ListItem info) -> long"""
return _controls_.ListCtrl_InsertItem(*args, **kwargs)
@@ -5361,6 +5373,10 @@ class GenericDirCtrl(_core.Control):
"""ExpandPath(self, String path) -> bool"""
return _controls_.GenericDirCtrl_ExpandPath(*args, **kwargs)
def CollapsePath(*args, **kwargs):
"""CollapsePath(self, String path) -> bool"""
return _controls_.GenericDirCtrl_CollapsePath(*args, **kwargs)
def GetDefaultPath(*args, **kwargs):
"""GetDefaultPath(self) -> String"""
return _controls_.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
@@ -5689,8 +5705,14 @@ class HelpEvent(_core.CommandEvent):
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
Origin_Unknown = _controls_.HelpEvent_Origin_Unknown
Origin_Keyboard = _controls_.HelpEvent_Origin_Keyboard
Origin_HelpButton = _controls_.HelpEvent_Origin_HelpButton
def __init__(self, *args, **kwargs):
"""__init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""
"""
__init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition,
int origin=Origin_Unknown) -> HelpEvent
"""
_controls_.HelpEvent_swiginit(self,_controls_.new_HelpEvent(*args, **kwargs))
def GetPosition(*args, **kwargs):
"""
@@ -5742,6 +5764,18 @@ class HelpEvent(_core.CommandEvent):
"""
return _controls_.HelpEvent_SetTarget(*args, **kwargs)
def GetOrigin(*args, **kwargs):
"""
GetOrigin(self) -> int
Optiononal indication of the source of the event.
"""
return _controls_.HelpEvent_GetOrigin(*args, **kwargs)
def SetOrigin(*args, **kwargs):
"""SetOrigin(self, int origin)"""
return _controls_.HelpEvent_SetOrigin(*args, **kwargs)
_controls_.HelpEvent_swigregister(HelpEvent)
class ContextHelp(_core.Object):
@@ -6154,5 +6188,130 @@ def PreDatePickerCtrl(*args, **kwargs):
val = _controls_.new_PreDatePickerCtrl(*args, **kwargs)
return val
HL_CONTEXTMENU = _controls_.HL_CONTEXTMENU
HL_DEFAULT_STYLE = _controls_.HL_DEFAULT_STYLE
#---------------------------------------------------------------------------
class HyperlinkCtrl(_core.Control):
"""
A static text control that emulates a hyperlink. The link is displayed
in an appropriate text style, derived from the control's normal font.
When the mouse rolls over the link, the cursor changes to a hand and
the link's color changes to the active color.
Clicking on the link does not launch a web browser; instead, a
wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
events.
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, Window parent, int id, String label, String url, Point pos=DefaultPosition,
Size size=DefaultSize,
long style=HL_DEFAULT_STYLE, String name=HyperlinkCtrlNameStr) -> HyperlinkCtrl
A static text control that emulates a hyperlink. The link is displayed
in an appropriate text style, derived from the control's normal font.
When the mouse rolls over the link, the cursor changes to a hand and
the link's color changes to the active color.
Clicking on the link does not launch a web browser; instead, a
wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
events.
"""
_controls_.HyperlinkCtrl_swiginit(self,_controls_.new_HyperlinkCtrl(*args, **kwargs))
self._setOORInfo(self)
def Create(*args, **kwargs):
"""
Create(self, Window parent, int id, String label, String url, Point pos=DefaultPosition,
Size size=DefaultSize,
long style=HL_DEFAULT_STYLE, String name=HyperlinkCtrlNameStr) -> bool
"""
return _controls_.HyperlinkCtrl_Create(*args, **kwargs)
def GetHoverColour(*args, **kwargs):
"""GetHoverColour(self) -> Colour"""
return _controls_.HyperlinkCtrl_GetHoverColour(*args, **kwargs)
def SetHoverColour(*args, **kwargs):
"""SetHoverColour(self, Colour colour)"""
return _controls_.HyperlinkCtrl_SetHoverColour(*args, **kwargs)
def GetNormalColour(*args, **kwargs):
"""GetNormalColour(self) -> Colour"""
return _controls_.HyperlinkCtrl_GetNormalColour(*args, **kwargs)
def SetNormalColour(*args, **kwargs):
"""SetNormalColour(self, Colour colour)"""
return _controls_.HyperlinkCtrl_SetNormalColour(*args, **kwargs)
def GetVisitedColour(*args, **kwargs):
"""GetVisitedColour(self) -> Colour"""
return _controls_.HyperlinkCtrl_GetVisitedColour(*args, **kwargs)
def SetVisitedColour(*args, **kwargs):
"""SetVisitedColour(self, Colour colour)"""
return _controls_.HyperlinkCtrl_SetVisitedColour(*args, **kwargs)
def GetURL(*args, **kwargs):
"""GetURL(self) -> String"""
return _controls_.HyperlinkCtrl_GetURL(*args, **kwargs)
def SetURL(*args, **kwargs):
"""SetURL(self, String url)"""
return _controls_.HyperlinkCtrl_SetURL(*args, **kwargs)
def SetVisited(*args, **kwargs):
"""SetVisited(self, bool visited=True)"""
return _controls_.HyperlinkCtrl_SetVisited(*args, **kwargs)
def GetVisited(*args, **kwargs):
"""GetVisited(self) -> bool"""
return _controls_.HyperlinkCtrl_GetVisited(*args, **kwargs)
_controls_.HyperlinkCtrl_swigregister(HyperlinkCtrl)
HyperlinkCtrlNameStr = cvar.HyperlinkCtrlNameStr
def PreHyperlinkCtrl(*args, **kwargs):
"""
PreHyperlinkCtrl() -> HyperlinkCtrl
A static text control that emulates a hyperlink. The link is displayed
in an appropriate text style, derived from the control's normal font.
When the mouse rolls over the link, the cursor changes to a hand and
the link's color changes to the active color.
Clicking on the link does not launch a web browser; instead, a
wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
events.
"""
val = _controls_.new_PreHyperlinkCtrl(*args, **kwargs)
return val
wxEVT_COMMAND_HYPERLINK = _controls_.wxEVT_COMMAND_HYPERLINK
class HyperlinkEvent(_core.CommandEvent):
"""Proxy of C++ HyperlinkEvent class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, Object generator, int id, String url) -> HyperlinkEvent"""
_controls_.HyperlinkEvent_swiginit(self,_controls_.new_HyperlinkEvent(*args, **kwargs))
def GetURL(*args, **kwargs):
"""GetURL(self) -> String"""
return _controls_.HyperlinkEvent_GetURL(*args, **kwargs)
def SetURL(*args, **kwargs):
"""SetURL(self, String url)"""
return _controls_.HyperlinkEvent_SetURL(*args, **kwargs)
_controls_.HyperlinkEvent_swigregister(HyperlinkEvent)
EVT_HYPERLINK = wx.PyEventBinder( wxEVT_COMMAND_HYPERLINK, 1 )
wxPython/src/gtk/_controls_wrap.cpp
+1201 -161
View File
File diff suppressed because one or more lines are too long
wxPython/src/gtk/_core.py
+28 -31
View File
@@ -271,13 +271,6 @@ ID_ZOOM_OUT = _core_.ID_ZOOM_OUT
ID_UNDELETE = _core_.ID_UNDELETE
ID_REVERT_TO_SAVED = _core_.ID_REVERT_TO_SAVED
ID_HIGHEST = _core_.ID_HIGHEST
OPEN = _core_.OPEN
SAVE = _core_.SAVE
HIDE_READONLY = _core_.HIDE_READONLY
OVERWRITE_PROMPT = _core_.OVERWRITE_PROMPT
FILE_MUST_EXIST = _core_.FILE_MUST_EXIST
MULTIPLE = _core_.MULTIPLE
CHANGE_DIR = _core_.CHANGE_DIR
ACCEL_ALT = _core_.ACCEL_ALT
ACCEL_CTRL = _core_.ACCEL_CTRL
ACCEL_SHIFT = _core_.ACCEL_SHIFT
@@ -290,9 +283,6 @@ PD_ESTIMATED_TIME = _core_.PD_ESTIMATED_TIME
PD_REMAINING_TIME = _core_.PD_REMAINING_TIME
PD_SMOOTH = _core_.PD_SMOOTH
PD_CAN_SKIP = _core_.PD_CAN_SKIP
DD_NEW_DIR_BUTTON = _core_.DD_NEW_DIR_BUTTON
DD_DEFAULT_STYLE = _core_.DD_DEFAULT_STYLE
DD_CHANGE_DIR = _core_.DD_CHANGE_DIR
MENU_TEAROFF = _core_.MENU_TEAROFF
MB_DOCKABLE = _core_.MB_DOCKABLE
NO_FULL_REPAINT_ON_RESIZE = _core_.NO_FULL_REPAINT_ON_RESIZE
@@ -3501,7 +3491,6 @@ wxEVT_CLOSE_WINDOW = _core_.wxEVT_CLOSE_WINDOW
wxEVT_END_SESSION = _core_.wxEVT_END_SESSION
wxEVT_QUERY_END_SESSION = _core_.wxEVT_QUERY_END_SESSION
wxEVT_ACTIVATE_APP = _core_.wxEVT_ACTIVATE_APP
wxEVT_POWER = _core_.wxEVT_POWER
wxEVT_ACTIVATE = _core_.wxEVT_ACTIVATE
wxEVT_CREATE = _core_.wxEVT_CREATE
wxEVT_DESTROY = _core_.wxEVT_DESTROY
@@ -3557,7 +3546,7 @@ EVT_ERASE_BACKGROUND = wx.PyEventBinder( wxEVT_ERASE_BACKGROUND )
EVT_CHAR = wx.PyEventBinder( wxEVT_CHAR )
EVT_KEY_DOWN = wx.PyEventBinder( wxEVT_KEY_DOWN )
EVT_KEY_UP = wx.PyEventBinder( wxEVT_KEY_UP )
EVT_HOTKEY = wx.PyEventBinder( wxEVT_HOTKEY, 1)
EVT_HOTKEY = wx.PyEventBinder( wxEVT_HOTKEY, 1)
EVT_CHAR_HOOK = wx.PyEventBinder( wxEVT_CHAR_HOOK )
EVT_MENU_OPEN = wx.PyEventBinder( wxEVT_MENU_OPEN )
EVT_MENU_CLOSE = wx.PyEventBinder( wxEVT_MENU_CLOSE )
@@ -3568,7 +3557,7 @@ EVT_KILL_FOCUS = wx.PyEventBinder( wxEVT_KILL_FOCUS )
EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )
EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )
EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )
EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )
@@ -3617,11 +3606,11 @@ EVT_MOUSE_EVENTS = wx.PyEventBinder([ wxEVT_LEFT_DOWN,
# Scrolling from wxWindow (sent to wxScrolledWindow)
EVT_SCROLLWIN = wx.PyEventBinder([ wxEVT_SCROLLWIN_TOP,
EVT_SCROLLWIN = wx.PyEventBinder([ wxEVT_SCROLLWIN_TOP,
wxEVT_SCROLLWIN_BOTTOM,
wxEVT_SCROLLWIN_LINEUP,
wxEVT_SCROLLWIN_LINEDOWN,
wxEVT_SCROLLWIN_PAGEUP,
wxEVT_SCROLLWIN_PAGEUP,
wxEVT_SCROLLWIN_PAGEDOWN,
wxEVT_SCROLLWIN_THUMBTRACK,
wxEVT_SCROLLWIN_THUMBRELEASE,
@@ -3637,14 +3626,14 @@ EVT_SCROLLWIN_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBTRACK )
EVT_SCROLLWIN_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBRELEASE )
# Scrolling from wx.Slider and wx.ScrollBar
EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
wxEVT_SCROLL_THUMBRELEASE,
EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
wxEVT_SCROLL_THUMBRELEASE,
wxEVT_SCROLL_CHANGED,
])
@@ -3658,15 +3647,15 @@ EVT_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK )
EVT_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE )
EVT_SCROLL_CHANGED = wx.PyEventBinder( wxEVT_SCROLL_CHANGED )
EVT_SCROLL_ENDSCROLL = EVT_SCROLL_CHANGED
# Scrolling from wx.Slider and wx.ScrollBar, with an id
EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
wxEVT_SCROLL_THUMBRELEASE,
wxEVT_SCROLL_CHANGED,
], 1)
@@ -8403,6 +8392,14 @@ class Window(EvtHandler):
"""
return _core_.Window_RemoveChild(*args, **kwargs)
def SetDoubleBuffered(*args, **kwargs):
"""
SetDoubleBuffered(self, bool on)
Currently wxGTK2 only.
"""
return _core_.Window_SetDoubleBuffered(*args, **kwargs)
def FindWindowById(*args, **kwargs):
"""
FindWindowById(self, long winid) -> Window
wxPython/src/gtk/_core_wrap.cpp
+39 -11
View File
@@ -33198,6 +33198,44 @@ fail:
}
SWIGINTERN PyObject *_wrap_Window_SetDoubleBuffered(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
bool arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
bool val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "on", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDoubleBuffered",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_SetDoubleBuffered" "', expected argument " "1"" of type '" "wxWindow *""'");
}
arg1 = reinterpret_cast< wxWindow * >(argp1);
ecode2 = SWIG_AsVal_bool(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Window_SetDoubleBuffered" "', expected argument " "2"" of type '" "bool""'");
}
arg2 = static_cast< bool >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetDoubleBuffered(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Window_FindWindowById(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
@@ -53462,6 +53500,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Window_Reparent", (PyCFunction) _wrap_Window_Reparent, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_AddChild", (PyCFunction) _wrap_Window_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_RemoveChild", (PyCFunction) _wrap_Window_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_SetDoubleBuffered", (PyCFunction) _wrap_Window_SetDoubleBuffered, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_FindWindowById", (PyCFunction) _wrap_Window_FindWindowById, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_FindWindowByName", (PyCFunction) _wrap_Window_FindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_GetEventHandler", (PyCFunction)_wrap_Window_GetEventHandler, METH_O, NULL},
@@ -55729,13 +55768,6 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "ID_UNDELETE",SWIG_From_int(static_cast< int >(wxID_UNDELETE)));
SWIG_Python_SetConstant(d, "ID_REVERT_TO_SAVED",SWIG_From_int(static_cast< int >(wxID_REVERT_TO_SAVED)));
SWIG_Python_SetConstant(d, "ID_HIGHEST",SWIG_From_int(static_cast< int >(wxID_HIGHEST)));
SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
SWIG_Python_SetConstant(d, "HIDE_READONLY",SWIG_From_int(static_cast< int >(wxHIDE_READONLY)));
SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST)));
SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE)));
SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR)));
SWIG_Python_SetConstant(d, "ACCEL_ALT",SWIG_From_int(static_cast< int >(wxACCEL_ALT)));
SWIG_Python_SetConstant(d, "ACCEL_CTRL",SWIG_From_int(static_cast< int >(wxACCEL_CTRL)));
SWIG_Python_SetConstant(d, "ACCEL_SHIFT",SWIG_From_int(static_cast< int >(wxACCEL_SHIFT)));
@@ -55748,9 +55780,6 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "PD_REMAINING_TIME",SWIG_From_int(static_cast< int >(wxPD_REMAINING_TIME)));
SWIG_Python_SetConstant(d, "PD_SMOOTH",SWIG_From_int(static_cast< int >(wxPD_SMOOTH)));
SWIG_Python_SetConstant(d, "PD_CAN_SKIP",SWIG_From_int(static_cast< int >(wxPD_CAN_SKIP)));
SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "MENU_TEAROFF",SWIG_From_int(static_cast< int >(wxMENU_TEAROFF)));
SWIG_Python_SetConstant(d, "MB_DOCKABLE",SWIG_From_int(static_cast< int >(wxMB_DOCKABLE)));
SWIG_Python_SetConstant(d, "NO_FULL_REPAINT_ON_RESIZE",SWIG_From_int(static_cast< int >(wxNO_FULL_REPAINT_ON_RESIZE)));
@@ -56330,7 +56359,6 @@ SWIGEXPORT void SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_END_SESSION", PyInt_FromLong(wxEVT_END_SESSION));
PyDict_SetItemString(d, "wxEVT_QUERY_END_SESSION", PyInt_FromLong(wxEVT_QUERY_END_SESSION));
PyDict_SetItemString(d, "wxEVT_ACTIVATE_APP", PyInt_FromLong(wxEVT_ACTIVATE_APP));
PyDict_SetItemString(d, "wxEVT_POWER", PyInt_FromLong(wxEVT_POWER));
PyDict_SetItemString(d, "wxEVT_ACTIVATE", PyInt_FromLong(wxEVT_ACTIVATE));
PyDict_SetItemString(d, "wxEVT_CREATE", PyInt_FromLong(wxEVT_CREATE));
PyDict_SetItemString(d, "wxEVT_DESTROY", PyInt_FromLong(wxEVT_DESTROY));
wxPython/src/gtk/_gdi.py
+122 -63
View File
@@ -1288,7 +1288,7 @@ class NativeFontInfo(object):
return _gdi_.NativeFontInfo_SetUnderlined(*args, **kwargs)
def SetFaceName(*args, **kwargs):
"""SetFaceName(self, String facename)"""
"""SetFaceName(self, String facename) -> bool"""
return _gdi_.NativeFontInfo_SetFaceName(*args, **kwargs)
def SetFamily(*args, **kwargs):
@@ -1679,7 +1679,7 @@ class Font(GDIObject):
def SetFaceName(*args, **kwargs):
"""
SetFaceName(self, String faceName)
SetFaceName(self, String faceName) -> bool
Sets the facename for the font. The facename, which should be a valid
font installed on the end-user's system.
@@ -1718,7 +1718,7 @@ class Font(GDIObject):
def SetNativeFontInfoFromString(*args, **kwargs):
"""
SetNativeFontInfoFromString(self, String info)
SetNativeFontInfoFromString(self, String info) -> bool
Set the font's attributes from string representation of a
`wx.NativeFontInfo` object.
@@ -1727,7 +1727,7 @@ class Font(GDIObject):
def SetNativeFontInfoUserDesc(*args, **kwargs):
"""
SetNativeFontInfoUserDesc(self, String info)
SetNativeFontInfoUserDesc(self, String info) -> bool
Set the font's attributes from a string formerly returned from
`GetNativeFontInfoDesc`.
@@ -1910,15 +1910,44 @@ class FontEnumerator(object):
return _gdi_.FontEnumerator_EnumerateEncodings(*args, **kwargs)
def GetEncodings(*args, **kwargs):
"""GetEncodings(self) -> PyObject"""
"""GetEncodings() -> PyObject"""
return _gdi_.FontEnumerator_GetEncodings(*args, **kwargs)
GetEncodings = staticmethod(GetEncodings)
def GetFacenames(*args, **kwargs):
"""GetFacenames(self) -> PyObject"""
"""GetFacenames() -> PyObject"""
return _gdi_.FontEnumerator_GetFacenames(*args, **kwargs)
GetFacenames = staticmethod(GetFacenames)
def IsValidFacename(*args, **kwargs):
"""
IsValidFacename(String str) -> bool
Convenience function that returns true if the given face name exist in
the user's system
"""
return _gdi_.FontEnumerator_IsValidFacename(*args, **kwargs)
IsValidFacename = staticmethod(IsValidFacename)
_gdi_.FontEnumerator_swigregister(FontEnumerator)
def FontEnumerator_GetEncodings(*args):
"""FontEnumerator_GetEncodings() -> PyObject"""
return _gdi_.FontEnumerator_GetEncodings(*args)
def FontEnumerator_GetFacenames(*args):
"""FontEnumerator_GetFacenames() -> PyObject"""
return _gdi_.FontEnumerator_GetFacenames(*args)
def FontEnumerator_IsValidFacename(*args, **kwargs):
"""
FontEnumerator_IsValidFacename(String str) -> bool
Convenience function that returns true if the given face name exist in
the user's system
"""
return _gdi_.FontEnumerator_IsValidFacename(*args, **kwargs)
#---------------------------------------------------------------------------
LANGUAGE_DEFAULT = _gdi_.LANGUAGE_DEFAULT
@@ -4396,44 +4425,50 @@ class StockGDI(object):
def _initStockObjects():
import wx
wx.ITALIC_FONT = StockGDI.instance().GetFont(StockGDI.FONT_ITALIC)
wx.NORMAL_FONT = StockGDI.instance().GetFont(StockGDI.FONT_NORMAL)
wx.SMALL_FONT = StockGDI.instance().GetFont(StockGDI.FONT_SMALL)
wx.SWISS_FONT = StockGDI.instance().GetFont(StockGDI.FONT_SWISS)
wx.ITALIC_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_ITALIC).this
wx.NORMAL_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_NORMAL).this
wx.SMALL_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_SMALL).this
wx.SWISS_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_SWISS).this
wx.BLACK_DASHED_PEN = StockGDI.GetPen(StockGDI.PEN_BLACKDASHED)
wx.BLACK_PEN = StockGDI.GetPen(StockGDI.PEN_BLACK)
wx.CYAN_PEN = StockGDI.GetPen(StockGDI.PEN_CYAN)
wx.GREEN_PEN = StockGDI.GetPen(StockGDI.PEN_GREEN)
wx.GREY_PEN = StockGDI.GetPen(StockGDI.PEN_GREY)
wx.LIGHT_GREY_PEN = StockGDI.GetPen(StockGDI.PEN_LIGHTGREY)
wx.MEDIUM_GREY_PEN = StockGDI.GetPen(StockGDI.PEN_MEDIUMGREY)
wx.RED_PEN = StockGDI.GetPen(StockGDI.PEN_RED)
wx.TRANSPARENT_PEN = StockGDI.GetPen(StockGDI.PEN_TRANSPARENT)
wx.WHITE_PEN = StockGDI.GetPen(StockGDI.PEN_WHITE)
wx.BLACK_DASHED_PEN.this = StockGDI.GetPen(StockGDI.PEN_BLACKDASHED).this
wx.BLACK_PEN.this = StockGDI.GetPen(StockGDI.PEN_BLACK).this
wx.CYAN_PEN.this = StockGDI.GetPen(StockGDI.PEN_CYAN).this
wx.GREEN_PEN.this = StockGDI.GetPen(StockGDI.PEN_GREEN).this
wx.GREY_PEN.this = StockGDI.GetPen(StockGDI.PEN_GREY).this
wx.LIGHT_GREY_PEN.this = StockGDI.GetPen(StockGDI.PEN_LIGHTGREY).this
wx.MEDIUM_GREY_PEN.this = StockGDI.GetPen(StockGDI.PEN_MEDIUMGREY).this
wx.RED_PEN.this = StockGDI.GetPen(StockGDI.PEN_RED).this
wx.TRANSPARENT_PEN.this = StockGDI.GetPen(StockGDI.PEN_TRANSPARENT).this
wx.WHITE_PEN.this = StockGDI.GetPen(StockGDI.PEN_WHITE).this
wx.BLACK_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_BLACK)
wx.BLUE_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_BLUE)
wx.CYAN_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_CYAN)
wx.GREEN_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_GREEN)
wx.GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_GREY)
wx.LIGHT_GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_LIGHTGREY)
wx.MEDIUM_GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_MEDIUMGREY)
wx.RED_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_RED)
wx.TRANSPARENT_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_TRANSPARENT)
wx.WHITE_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_WHITE)
wx.BLACK_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_BLACK).this
wx.BLUE_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_BLUE).this
wx.CYAN_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_CYAN).this
wx.GREEN_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_GREEN).this
wx.GREY_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_GREY).this
wx.LIGHT_GREY_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_LIGHTGREY).this
wx.MEDIUM_GREY_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_MEDIUMGREY).this
wx.RED_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_RED).this
wx.TRANSPARENT_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_TRANSPARENT).this
wx.WHITE_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_WHITE).this
wx.BLACK = StockGDI.GetColour(StockGDI.COLOUR_BLACK)
wx.BLUE = StockGDI.GetColour(StockGDI.COLOUR_BLUE)
wx.CYAN = StockGDI.GetColour(StockGDI.COLOUR_CYAN)
wx.GREEN = StockGDI.GetColour(StockGDI.COLOUR_GREEN)
wx.LIGHT_GREY = StockGDI.GetColour(StockGDI.COLOUR_LIGHTGREY)
wx.RED = StockGDI.GetColour(StockGDI.COLOUR_RED)
wx.WHITE = StockGDI.GetColour(StockGDI.COLOUR_WHITE)
wx.BLACK.this = StockGDI.GetColour(StockGDI.COLOUR_BLACK).this
wx.BLUE.this = StockGDI.GetColour(StockGDI.COLOUR_BLUE).this
wx.CYAN.this = StockGDI.GetColour(StockGDI.COLOUR_CYAN).this
wx.GREEN.this = StockGDI.GetColour(StockGDI.COLOUR_GREEN).this
wx.LIGHT_GREY.this = StockGDI.GetColour(StockGDI.COLOUR_LIGHTGREY).this
wx.RED.this = StockGDI.GetColour(StockGDI.COLOUR_RED).this
wx.WHITE.this = StockGDI.GetColour(StockGDI.COLOUR_WHITE).this
wx.CROSS_CURSOR.this = StockGDI.GetCursor(StockGDI.CURSOR_CROSS).this
wx.HOURGLASS_CURSOR.this = StockGDI.GetCursor(StockGDI.CURSOR_HOURGLASS).this
wx.STANDARD_CURSOR.this = StockGDI.GetCursor(StockGDI.CURSOR_STANDARD).this
wx.TheFontList.this = _wxPyInitTheFontList().this
wx.ThePenList.this = _wxPyInitThePenList().this
wx.TheBrushList.this = _wxPyInitTheBrushList().this
wx.TheColourDatabase.this = _wxPyInitTheColourDatabase().this
wx.CROSS_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_CROSS)
wx.HOURGLASS_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_HOURGLASS)
wx.STANDARD_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_STANDARD)
_initStockObjects = staticmethod(_initStockObjects)
@@ -4463,6 +4498,47 @@ def StockGDI_GetPen(*args, **kwargs):
"""StockGDI_GetPen(int item) -> Pen"""
return _gdi_.StockGDI_GetPen(*args, **kwargs)
# Create an uninitialized instance for the stock objects, they will
# be initialized later when the wx.App object is created.
ITALIC_FONT = Font.__new__(Font)
NORMAL_FONT = Font.__new__(Font)
SMALL_FONT = Font.__new__(Font)
SWISS_FONT = Font.__new__(Font)
BLACK_DASHED_PEN = Pen.__new__(Pen)
BLACK_PEN = Pen.__new__(Pen)
CYAN_PEN = Pen.__new__(Pen)
GREEN_PEN = Pen.__new__(Pen)
GREY_PEN = Pen.__new__(Pen)
LIGHT_GREY_PEN = Pen.__new__(Pen)
MEDIUM_GREY_PEN = Pen.__new__(Pen)
RED_PEN = Pen.__new__(Pen)
TRANSPARENT_PEN = Pen.__new__(Pen)
WHITE_PEN = Pen.__new__(Pen)
BLACK_BRUSH = Brush.__new__(Brush)
BLUE_BRUSH = Brush.__new__(Brush)
CYAN_BRUSH = Brush.__new__(Brush)
GREEN_BRUSH = Brush.__new__(Brush)
GREY_BRUSH = Brush.__new__(Brush)
LIGHT_GREY_BRUSH = Brush.__new__(Brush)
MEDIUM_GREY_BRUSH = Brush.__new__(Brush)
RED_BRUSH = Brush.__new__(Brush)
TRANSPARENT_BRUSH = Brush.__new__(Brush)
WHITE_BRUSH = Brush.__new__(Brush)
BLACK = Colour.__new__(Colour)
BLUE = Colour.__new__(Colour)
CYAN = Colour.__new__(Colour)
GREEN = Colour.__new__(Colour)
LIGHT_GREY = Colour.__new__(Colour)
RED = Colour.__new__(Colour)
WHITE = Colour.__new__(Colour)
CROSS_CURSOR = Cursor.__new__(Cursor)
HOURGLASS_CURSOR = Cursor.__new__(Cursor)
STANDARD_CURSOR = Cursor.__new__(Cursor)
class GDIObjListBase(object):
"""Proxy of C++ GDIObjListBase class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -4599,29 +4675,12 @@ def _wxPyInitTheBrushList(*args):
def _wxPyInitTheColourDatabase(*args):
"""_wxPyInitTheColourDatabase() -> ColourDatabase"""
return _gdi_._wxPyInitTheColourDatabase(*args)
# This function makes a class used to do delayed initialization of some
# stock wx objects. When they are used the first time then an init function
# is called to make the real instance, which is then used to replace the
# original instance and class seen by the programmer.
def _wxPyMakeDelayedInitWrapper(initFunc):
class _wxPyStockObjectWrapper(object):
def __init__(self, *args):
self._args = args
def __getattr__(self, name):
obj = initFunc(*self._args)
self.__class__ = obj.__class__
self.__dict__ = obj.__dict__
return getattr(self, name)
def __str__(self):
return self.__getattr__("__str__")()
def __repr__(self):
return self.__getattr__("__repr__")()
return _wxPyStockObjectWrapper
TheFontList = _wxPyMakeDelayedInitWrapper(_wxPyInitTheFontList)()
ThePenList = _wxPyMakeDelayedInitWrapper(_wxPyInitThePenList)()
TheBrushList = _wxPyMakeDelayedInitWrapper(_wxPyInitTheBrushList)()
TheColourDatabase = _wxPyMakeDelayedInitWrapper(_wxPyInitTheColourDatabase)()
# Create an uninitialized instance for the stock objects, they will
# be initialized later when the wx.App object is created.
TheFontList = FontList.__new__(FontList)
ThePenList = PenList.__new__(PenList)
TheBrushList = BrushList.__new__(BrushList)
TheColourDatabase = ColourDatabase.__new__(ColourDatabase)
NullColor = NullColour
#---------------------------------------------------------------------------
wxPython/src/gtk/_gdi_wrap.cpp
+76 -46
View File
@@ -3076,25 +3076,19 @@ IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFacename);
IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);
SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){
SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(){
PyObject* ret;
wxArrayString* arr = self->GetEncodings();
wxArrayString arr = wxFontEnumerator::GetEncodings();
wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (arr)
ret = wxArrayString2PyList_helper(*arr);
else
ret = PyList_New(0);
ret = wxArrayString2PyList_helper(arr);
wxPyEndBlockThreads(blocked);
return ret;
}
SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(){
PyObject* ret;
wxArrayString* arr = self->GetFacenames();
wxArrayString arr = wxFontEnumerator::GetFacenames();
wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (arr)
ret = wxArrayString2PyList_helper(*arr);
else
ret = PyList_New(0);
ret = wxArrayString2PyList_helper(arr);
wxPyEndBlockThreads(blocked);
return ret;
}
@@ -9843,6 +9837,7 @@ SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *SWIGUNUSEDPARM(s
PyObject *resultobj = 0;
wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
wxString arg2 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject * obj0 = 0 ;
@@ -9865,11 +9860,13 @@ SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *SWIGUNUSEDPARM(s
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetFaceName(arg2);
result = (bool)(arg1)->SetFaceName(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
@@ -12232,6 +12229,7 @@ SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyOb
PyObject *resultobj = 0;
wxFont *arg1 = (wxFont *) 0 ;
wxString *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
bool temp2 = false ;
@@ -12254,11 +12252,13 @@ SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetFaceName((wxString const &)*arg2);
result = (bool)(arg1)->SetFaceName((wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp2)
delete arg2;
@@ -12394,6 +12394,7 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *SWIGUNUSED
PyObject *resultobj = 0;
wxFont *arg1 = (wxFont *) 0 ;
wxString *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
bool temp2 = false ;
@@ -12416,11 +12417,13 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *SWIGUNUSED
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetNativeFontInfo((wxString const &)*arg2);
result = (bool)(arg1)->SetNativeFontInfo((wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp2)
delete arg2;
@@ -12439,6 +12442,7 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPA
PyObject *resultobj = 0;
wxFont *arg1 = (wxFont *) 0 ;
wxString *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
bool temp2 = false ;
@@ -12461,11 +12465,13 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPA
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetNativeFontInfoUserDesc((wxString const &)*arg2);
result = (bool)(arg1)->SetNativeFontInfoUserDesc((wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp2)
delete arg2;
@@ -12910,22 +12916,12 @@ fail:
SWIGINTERN PyObject *_wrap_FontEnumerator_GetEncodings(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
PyObject *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_GetEncodings" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'");
}
arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetEncodings",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (PyObject *)wxPyFontEnumerator_GetEncodings(arg1);
result = (PyObject *)wxPyFontEnumerator_GetEncodings();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -12938,22 +12934,12 @@ fail:
SWIGINTERN PyObject *_wrap_FontEnumerator_GetFacenames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
PyObject *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_GetFacenames" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'");
}
arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetFacenames",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (PyObject *)wxPyFontEnumerator_GetFacenames(arg1);
result = (PyObject *)wxPyFontEnumerator_GetFacenames();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -12964,6 +12950,45 @@ fail:
}
SWIGINTERN PyObject *_wrap_FontEnumerator_IsValidFacename(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxString *arg1 = 0 ;
bool result;
bool temp1 = false ;
PyObject * obj0 = 0 ;
char * kwnames[] = {
(char *) "str", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontEnumerator_IsValidFacename",kwnames,&obj0)) SWIG_fail;
{
arg1 = wxString_in_helper(obj0);
if (arg1 == NULL) SWIG_fail;
temp1 = true;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)wxPyFontEnumerator::IsValidFacename((wxString const &)*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp1)
delete arg1;
}
return resultobj;
fail:
{
if (temp1)
delete arg1;
}
return NULL;
}
SWIGINTERN PyObject *FontEnumerator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -24713,6 +24738,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_Get(PyObject *SWIGUNUSEDPARM(self), Py
if (!SWIG_Python_UnpackTuple(args,"RendererNative_Get",0,0,0)) SWIG_fail;
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRendererNative &_result_ref = wxRendererNative::Get();
@@ -24734,6 +24760,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_GetGeneric(PyObject *SWIGUNUSEDPARM(se
if (!SWIG_Python_UnpackTuple(args,"RendererNative_GetGeneric",0,0,0)) SWIG_fail;
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRendererNative &_result_ref = wxRendererNative::GetGeneric();
@@ -24755,6 +24782,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_GetDefault(PyObject *SWIGUNUSEDPARM(se
if (!SWIG_Python_UnpackTuple(args,"RendererNative_GetDefault",0,0,0)) SWIG_fail;
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRendererNative &_result_ref = wxRendererNative::GetDefault();
@@ -24788,6 +24816,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_Set(PyObject *SWIGUNUSEDPARM(self), Py
}
arg1 = reinterpret_cast< wxRendererNative * >(argp1);
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxRendererNative *)wxRendererNative::Set(arg1);
wxPyEndAllowThreads(__tstate);
@@ -25125,8 +25154,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FontEnumerator__setCallbackInfo", (PyCFunction) _wrap_FontEnumerator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_EnumerateFacenames", (PyCFunction) _wrap_FontEnumerator_EnumerateFacenames, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_EnumerateEncodings", (PyCFunction) _wrap_FontEnumerator_EnumerateEncodings, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_GetEncodings", (PyCFunction)_wrap_FontEnumerator_GetEncodings, METH_O, NULL},
{ (char *)"FontEnumerator_GetFacenames", (PyCFunction)_wrap_FontEnumerator_GetFacenames, METH_O, NULL},
{ (char *)"FontEnumerator_GetEncodings", (PyCFunction)_wrap_FontEnumerator_GetEncodings, METH_NOARGS, NULL},
{ (char *)"FontEnumerator_GetFacenames", (PyCFunction)_wrap_FontEnumerator_GetFacenames, METH_NOARGS, NULL},
{ (char *)"FontEnumerator_IsValidFacename", (PyCFunction) _wrap_FontEnumerator_IsValidFacename, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_swigregister", FontEnumerator_swigregister, METH_VARARGS, NULL},
{ (char *)"FontEnumerator_swiginit", FontEnumerator_swiginit, METH_VARARGS, NULL},
{ (char *)"LanguageInfo_Language_set", _wrap_LanguageInfo_Language_set, METH_VARARGS, NULL},
wxPython/src/gtk/_misc.py
+61 -1
View File
@@ -432,7 +432,7 @@ def SaveFileSelector(*args, **kwargs):
def DirSelector(*args, **kwargs):
"""
DirSelector(String message=DirSelectorPromptStr, String defaultPath=EmptyString,
long style=DD_DEFAULT_STYLE,
long style=wxDD_DEFAULT_STYLE,
Point pos=DefaultPosition, Window parent=None) -> String
"""
return _misc_.DirSelector(*args, **kwargs)
@@ -5768,5 +5768,65 @@ def StandardPaths_Get(*args):
"""
return _misc_.StandardPaths_Get(*args)
#---------------------------------------------------------------------------
POWER_SOCKET = _misc_.POWER_SOCKET
POWER_BATTERY = _misc_.POWER_BATTERY
POWER_UNKNOWN = _misc_.POWER_UNKNOWN
BATTERY_NORMAL_STATE = _misc_.BATTERY_NORMAL_STATE
BATTERY_LOW_STATE = _misc_.BATTERY_LOW_STATE
BATTERY_CRITICAL_STATE = _misc_.BATTERY_CRITICAL_STATE
BATTERY_SHUTDOWN_STATE = _misc_.BATTERY_SHUTDOWN_STATE
BATTERY_UNKNOWN_STATE = _misc_.BATTERY_UNKNOWN_STATE
class PowerEvent(_core.Event):
"""
wx.PowerEvent is generated when the system online status changes.
Currently this is only implemented for Windows.
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, EventType evtType) -> PowerEvent
wx.PowerEvent is generated when the system online status changes.
Currently this is only implemented for Windows.
"""
_misc_.PowerEvent_swiginit(self,_misc_.new_PowerEvent(*args, **kwargs))
def Veto(*args, **kwargs):
"""Veto(self)"""
return _misc_.PowerEvent_Veto(*args, **kwargs)
def IsVetoed(*args, **kwargs):
"""IsVetoed(self) -> bool"""
return _misc_.PowerEvent_IsVetoed(*args, **kwargs)
_misc_.PowerEvent_swigregister(PowerEvent)
wxEVT_POWER_SUSPENDING = _misc_.wxEVT_POWER_SUSPENDING
wxEVT_POWER_SUSPENDED = _misc_.wxEVT_POWER_SUSPENDED
wxEVT_POWER_SUSPEND_CANCEL = _misc_.wxEVT_POWER_SUSPEND_CANCEL
wxEVT_POWER_RESUME = _misc_.wxEVT_POWER_RESUME
EVT_POWER_SUSPENDING = wx.PyEventBinder( wxEVT_POWER_SUSPENDING , 1 )
EVT_POWER_SUSPENDED = wx.PyEventBinder( wxEVT_POWER_SUSPENDED , 1 )
EVT_POWER_SUSPEND_CANCEL = wx.PyEventBinder( wxEVT_POWER_SUSPEND_CANCEL , 1 )
EVT_POWER_RESUME = wx.PyEventBinder( wxEVT_POWER_RESUME , 1 )
def GetPowerType(*args):
"""
GetPowerType() -> int
return the current system power state: online or offline
"""
return _misc_.GetPowerType(*args)
def GetBatteryState(*args):
"""
GetBatteryState() -> int
return approximate battery state
"""
return _misc_.GetBatteryState(*args)
wxPython/src/gtk/_misc_wrap.cpp
+256 -63
View File
File diff suppressed because one or more lines are too long
wxPython/src/gtk/_windows.py
+21 -20
View File
@@ -2139,6 +2139,9 @@ def GetColourFromUser(*args, **kwargs):
String caption=EmptyString) -> Colour
"""
return _windows_.GetColourFromUser(*args, **kwargs)
DD_NEW_DIR_BUTTON = _windows_.DD_NEW_DIR_BUTTON
DD_DEFAULT_STYLE = _windows_.DD_DEFAULT_STYLE
DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
class DirDialog(Dialog):
"""
wx.DirDialog allows the user to select a directory by browising the
@@ -2149,7 +2152,7 @@ class DirDialog(Dialog):
def __init__(self, *args, **kwargs):
"""
__init__(self, Window parent, String message=DirSelectorPromptStr,
String defaultPath=EmptyString, long style=0,
String defaultPath=EmptyString, long style=DD_DEFAULT_STYLE,
Point pos=DefaultPosition, Size size=DefaultSize,
String name=DirDialogNameStr) -> DirDialog
@@ -2192,6 +2195,19 @@ class DirDialog(Dialog):
_windows_.DirDialog_swigregister(DirDialog)
OPEN = _windows_.OPEN
SAVE = _windows_.SAVE
OVERWRITE_PROMPT = _windows_.OVERWRITE_PROMPT
FILE_MUST_EXIST = _windows_.FILE_MUST_EXIST
MULTIPLE = _windows_.MULTIPLE
CHANGE_DIR = _windows_.CHANGE_DIR
FD_OPEN = _windows_.FD_OPEN
FD_SAVE = _windows_.FD_SAVE
FD_OVERWRITE_PROMPT = _windows_.FD_OVERWRITE_PROMPT
FD_FILE_MUST_EXIST = _windows_.FD_FILE_MUST_EXIST
FD_MULTIPLE = _windows_.FD_MULTIPLE
FD_CHANGE_DIR = _windows_.FD_CHANGE_DIR
FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE
class FileDialog(Dialog):
"""
wx.FileDialog allows the user to select one or more files from the
@@ -2204,7 +2220,8 @@ class FileDialog(Dialog):
__init__(self, Window parent, String message=FileSelectorPromptStr,
String defaultDir=EmptyString, String defaultFile=EmptyString,
String wildcard=FileSelectorDefaultWildcardStr,
long style=0, Point pos=DefaultPosition) -> FileDialog
long style=FD_DEFAULT_STYLE,
Point pos=DefaultPosition) -> FileDialog
Constructor. Use ShowModal method to show the dialog.
"""
@@ -2256,14 +2273,6 @@ class FileDialog(Dialog):
"""
return _windows_.FileDialog_SetWildcard(*args, **kwargs)
def SetStyle(*args, **kwargs):
"""
SetStyle(self, long style)
Sets the dialog style.
"""
return _windows_.FileDialog_SetStyle(*args, **kwargs)
def SetFilterIndex(*args, **kwargs):
"""
SetFilterIndex(self, int filterIndex)
@@ -2312,14 +2321,6 @@ class FileDialog(Dialog):
"""
return _windows_.FileDialog_GetWildcard(*args, **kwargs)
def GetStyle(*args, **kwargs):
"""
GetStyle(self) -> long
Returns the dialog style.
"""
return _windows_.FileDialog_GetStyle(*args, **kwargs)
def GetFilterIndex(*args, **kwargs):
"""
GetFilterIndex(self) -> int
@@ -2750,11 +2751,11 @@ EVT_FIND_REPLACE_ALL = wx.PyEventBinder( wxEVT_COMMAND_FIND_REPLACE_ALL, 1 )
EVT_FIND_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_FIND_CLOSE, 1 )
# For backwards compatibility. Should they be removed?
EVT_COMMAND_FIND = EVT_FIND
EVT_COMMAND_FIND = EVT_FIND
EVT_COMMAND_FIND_NEXT = EVT_FIND_NEXT
EVT_COMMAND_FIND_REPLACE = EVT_FIND_REPLACE
EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL
EVT_COMMAND_FIND_CLOSE = EVT_FIND_CLOSE
EVT_COMMAND_FIND_CLOSE = EVT_FIND_CLOSE
class FindDialogEvent(_core.CommandEvent):
"""Events for the FindReplaceDialog"""
wxPython/src/gtk/_windows_wrap.cpp
+18 -70
View File
@@ -16636,7 +16636,7 @@ SWIGINTERN PyObject *_wrap_new_DirDialog(PyObject *SWIGUNUSEDPARM(self), PyObjec
wxString *arg2 = (wxString *) &arg2_defvalue ;
wxString const &arg3_defvalue = wxPyEmptyString ;
wxString *arg3 = (wxString *) &arg3_defvalue ;
long arg4 = (long) 0 ;
long arg4 = (long) wxDD_DEFAULT_STYLE ;
wxPoint const &arg5_defvalue = wxDefaultPosition ;
wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
wxSize const &arg6_defvalue = wxDefaultSize ;
@@ -16928,7 +16928,7 @@ SWIGINTERN PyObject *_wrap_new_FileDialog(PyObject *SWIGUNUSEDPARM(self), PyObje
wxString *arg4 = (wxString *) &arg4_defvalue ;
wxString const &arg5_defvalue = wxPyFileSelectorDefaultWildcardStr ;
wxString *arg5 = (wxString *) &arg5_defvalue ;
long arg6 = (long) 0 ;
long arg6 = (long) wxFD_DEFAULT_STYLE ;
wxPoint const &arg7_defvalue = wxDefaultPosition ;
wxPoint *arg7 = (wxPoint *) &arg7_defvalue ;
wxFileDialog *result = 0 ;
@@ -17270,44 +17270,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_FileDialog_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
long arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
long val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "style", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFileDialog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FileDialog_SetStyle" "', expected argument " "1"" of type '" "wxFileDialog *""'");
}
arg1 = reinterpret_cast< wxFileDialog * >(argp1);
ecode2 = SWIG_AsVal_long(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FileDialog_SetStyle" "', expected argument " "2"" of type '" "long""'");
}
arg2 = static_cast< long >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetStyle(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
@@ -17516,34 +17478,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_FileDialog_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
long result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFileDialog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FileDialog_GetStyle" "', expected argument " "1"" of type '" "wxFileDialog const *""'");
}
arg1 = reinterpret_cast< wxFileDialog * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (long)((wxFileDialog const *)arg1)->GetStyle();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_long(static_cast< long >(result));
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_FileDialog_GetFilterIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
@@ -30962,14 +30896,12 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FileDialog_SetDirectory", (PyCFunction) _wrap_FileDialog_SetDirectory, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetFilename", (PyCFunction) _wrap_FileDialog_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetWildcard", (PyCFunction) _wrap_FileDialog_SetWildcard, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetStyle", (PyCFunction) _wrap_FileDialog_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetFilterIndex", (PyCFunction) _wrap_FileDialog_SetFilterIndex, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_GetMessage", (PyCFunction)_wrap_FileDialog_GetMessage, METH_O, NULL},
{ (char *)"FileDialog_GetPath", (PyCFunction)_wrap_FileDialog_GetPath, METH_O, NULL},
{ (char *)"FileDialog_GetDirectory", (PyCFunction)_wrap_FileDialog_GetDirectory, METH_O, NULL},
{ (char *)"FileDialog_GetFilename", (PyCFunction)_wrap_FileDialog_GetFilename, METH_O, NULL},
{ (char *)"FileDialog_GetWildcard", (PyCFunction)_wrap_FileDialog_GetWildcard, METH_O, NULL},
{ (char *)"FileDialog_GetStyle", (PyCFunction)_wrap_FileDialog_GetStyle, METH_O, NULL},
{ (char *)"FileDialog_GetFilterIndex", (PyCFunction)_wrap_FileDialog_GetFilterIndex, METH_O, NULL},
{ (char *)"FileDialog_GetFilenames", (PyCFunction)_wrap_FileDialog_GetFilenames, METH_O, NULL},
{ (char *)"FileDialog_GetPaths", (PyCFunction)_wrap_FileDialog_GetPaths, METH_O, NULL},
@@ -33667,6 +33599,22 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
SWIG_addvarlink(SWIG_globals(),(char*)"GetTextFromUserPromptStr",GetTextFromUserPromptStr_get, GetTextFromUserPromptStr_set);
SWIG_addvarlink(SWIG_globals(),(char*)"MessageBoxCaptionStr",MessageBoxCaptionStr_get, MessageBoxCaptionStr_set);
SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST)));
SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE)));
SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR)));
SWIG_Python_SetConstant(d, "FD_OPEN",SWIG_From_int(static_cast< int >(wxFD_OPEN)));
SWIG_Python_SetConstant(d, "FD_SAVE",SWIG_From_int(static_cast< int >(wxFD_SAVE)));
SWIG_Python_SetConstant(d, "FD_OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxFD_OVERWRITE_PROMPT)));
SWIG_Python_SetConstant(d, "FD_FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFD_FILE_MUST_EXIST)));
SWIG_Python_SetConstant(d, "FD_MULTIPLE",SWIG_From_int(static_cast< int >(wxFD_MULTIPLE)));
SWIG_Python_SetConstant(d, "FD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxFD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "FD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxFD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "CHOICEDLG_STYLE",SWIG_From_int(static_cast< int >(wxCHOICEDLG_STYLE)));
SWIG_Python_SetConstant(d, "TextEntryDialogStyle",SWIG_From_int(static_cast< int >(wxTextEntryDialogStyle)));
SWIG_addvarlink(SWIG_globals(),(char*)"GetPasswordFromUserPromptStr",GetPasswordFromUserPromptStr_get, GetPasswordFromUserPromptStr_set);
wxPython/src/gtk/html.py
+2 -6
View File
@@ -686,10 +686,6 @@ class HtmlCell(_core.Object):
"""ProcessMouseClick(self, HtmlWindowInterface window, Point pos, MouseEvent event) -> bool"""
return _html.HtmlCell_ProcessMouseClick(*args, **kwargs)
def AdjustPagebreak(*args, **kwargs):
"""AdjustPagebreak(self, int INOUT) -> bool"""
return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)
def SetCanLiveOnPagebreak(*args, **kwargs):
"""SetCanLiveOnPagebreak(self, bool can)"""
return _html.HtmlCell_SetCanLiveOnPagebreak(*args, **kwargs)
@@ -1197,8 +1193,8 @@ class HtmlDCRenderer(_core.Object):
def Render(*args, **kwargs):
"""
Render(self, int x, int y, int from=0, int dont_render=False, int maxHeight=INT_MAX,
int choices=None, int LCOUNT=0) -> int
Render(self, int x, int y, wxArrayInt known_pagebreaks, int from=0,
int dont_render=False, int to=INT_MAX) -> int
"""
return _html.HtmlDCRenderer_Render(*args, **kwargs)
wxPython/src/gtk/html_wrap.cpp
+230 -275
View File
File diff suppressed because it is too large Load Diff
wxPython/src/mac/_controls.py
+169 -10
View File
@@ -2856,6 +2856,15 @@ class BookCtrlBase(_core.Control):
"""AdvanceSelection(self, bool forward=True)"""
return _controls_.BookCtrlBase_AdvanceSelection(*args, **kwargs)
def HitTest(*args, **kwargs):
"""
HitTest(Point pt) -> (tab, where)
Returns the page/tab which is hit, and flags indicating where using
wx.NB_HITTEST flags.
"""
return _controls_.BookCtrlBase_HitTest(*args, **kwargs)
def GetClassDefaultAttributes(*args, **kwargs):
"""
GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -2971,15 +2980,6 @@ class Notebook(BookCtrlBase):
"""SetTabSize(self, Size sz)"""
return _controls_.Notebook_SetTabSize(*args, **kwargs)
def HitTest(*args, **kwargs):
"""
HitTest(Point pt) -> (tab, where)
Returns the tab which is hit, and flags indicating where using
wx.NB_HITTEST flags.
"""
return _controls_.Notebook_HitTest(*args, **kwargs)
def GetThemeBackgroundColour(*args, **kwargs):
"""GetThemeBackgroundColour(self) -> Colour"""
return _controls_.Notebook_GetThemeBackgroundColour(*args, **kwargs)
@@ -3334,6 +3334,7 @@ TB_NODIVIDER = _controls_.TB_NODIVIDER
TB_NOALIGN = _controls_.TB_NOALIGN
TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
class ToolBarToolBase(_core.Object):
"""Proxy of C++ ToolBarToolBase class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -3894,6 +3895,7 @@ LIST_HITTEST_ONITEMSTATEICON = _controls_.LIST_HITTEST_ONITEMSTATEICON
LIST_HITTEST_TOLEFT = _controls_.LIST_HITTEST_TOLEFT
LIST_HITTEST_TORIGHT = _controls_.LIST_HITTEST_TORIGHT
LIST_HITTEST_ONITEM = _controls_.LIST_HITTEST_ONITEM
LIST_GETSUBITEMRECT_WHOLEITEM = _controls_.LIST_GETSUBITEMRECT_WHOLEITEM
LIST_NEXT_ABOVE = _controls_.LIST_NEXT_ABOVE
LIST_NEXT_ALL = _controls_.LIST_NEXT_ALL
LIST_NEXT_BELOW = _controls_.LIST_NEXT_BELOW
@@ -4482,6 +4484,16 @@ class ListCtrl(_core.Control):
"""
return _controls_.ListCtrl_HitTest(*args, **kwargs)
def HitTestSubItem(*args, **kwargs):
"""
HitTestSubItem(Point point) -> (item, where, subItem)
Determines which item (if any) is at the specified point, giving in
the second return value (see wx.LIST_HITTEST flags) and also the subItem, if
any.
"""
return _controls_.ListCtrl_HitTestSubItem(*args, **kwargs)
def InsertItem(*args, **kwargs):
"""InsertItem(self, ListItem info) -> long"""
return _controls_.ListCtrl_InsertItem(*args, **kwargs)
@@ -5348,6 +5360,10 @@ class GenericDirCtrl(_core.Control):
"""ExpandPath(self, String path) -> bool"""
return _controls_.GenericDirCtrl_ExpandPath(*args, **kwargs)
def CollapsePath(*args, **kwargs):
"""CollapsePath(self, String path) -> bool"""
return _controls_.GenericDirCtrl_CollapsePath(*args, **kwargs)
def GetDefaultPath(*args, **kwargs):
"""GetDefaultPath(self) -> String"""
return _controls_.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
@@ -5676,8 +5692,14 @@ class HelpEvent(_core.CommandEvent):
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
Origin_Unknown = _controls_.HelpEvent_Origin_Unknown
Origin_Keyboard = _controls_.HelpEvent_Origin_Keyboard
Origin_HelpButton = _controls_.HelpEvent_Origin_HelpButton
def __init__(self, *args, **kwargs):
"""__init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""
"""
__init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition,
int origin=Origin_Unknown) -> HelpEvent
"""
_controls_.HelpEvent_swiginit(self,_controls_.new_HelpEvent(*args, **kwargs))
def GetPosition(*args, **kwargs):
"""
@@ -5729,6 +5751,18 @@ class HelpEvent(_core.CommandEvent):
"""
return _controls_.HelpEvent_SetTarget(*args, **kwargs)
def GetOrigin(*args, **kwargs):
"""
GetOrigin(self) -> int
Optiononal indication of the source of the event.
"""
return _controls_.HelpEvent_GetOrigin(*args, **kwargs)
def SetOrigin(*args, **kwargs):
"""SetOrigin(self, int origin)"""
return _controls_.HelpEvent_SetOrigin(*args, **kwargs)
_controls_.HelpEvent_swigregister(HelpEvent)
class ContextHelp(_core.Object):
@@ -6141,5 +6175,130 @@ def PreDatePickerCtrl(*args, **kwargs):
val = _controls_.new_PreDatePickerCtrl(*args, **kwargs)
return val
HL_CONTEXTMENU = _controls_.HL_CONTEXTMENU
HL_DEFAULT_STYLE = _controls_.HL_DEFAULT_STYLE
#---------------------------------------------------------------------------
class HyperlinkCtrl(_core.Control):
"""
A static text control that emulates a hyperlink. The link is displayed
in an appropriate text style, derived from the control's normal font.
When the mouse rolls over the link, the cursor changes to a hand and
the link's color changes to the active color.
Clicking on the link does not launch a web browser; instead, a
wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
events.
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, Window parent, int id, String label, String url, Point pos=DefaultPosition,
Size size=DefaultSize,
long style=HL_DEFAULT_STYLE, String name=HyperlinkCtrlNameStr) -> HyperlinkCtrl
A static text control that emulates a hyperlink. The link is displayed
in an appropriate text style, derived from the control's normal font.
When the mouse rolls over the link, the cursor changes to a hand and
the link's color changes to the active color.
Clicking on the link does not launch a web browser; instead, a
wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
events.
"""
_controls_.HyperlinkCtrl_swiginit(self,_controls_.new_HyperlinkCtrl(*args, **kwargs))
self._setOORInfo(self)
def Create(*args, **kwargs):
"""
Create(self, Window parent, int id, String label, String url, Point pos=DefaultPosition,
Size size=DefaultSize,
long style=HL_DEFAULT_STYLE, String name=HyperlinkCtrlNameStr) -> bool
"""
return _controls_.HyperlinkCtrl_Create(*args, **kwargs)
def GetHoverColour(*args, **kwargs):
"""GetHoverColour(self) -> Colour"""
return _controls_.HyperlinkCtrl_GetHoverColour(*args, **kwargs)
def SetHoverColour(*args, **kwargs):
"""SetHoverColour(self, Colour colour)"""
return _controls_.HyperlinkCtrl_SetHoverColour(*args, **kwargs)
def GetNormalColour(*args, **kwargs):
"""GetNormalColour(self) -> Colour"""
return _controls_.HyperlinkCtrl_GetNormalColour(*args, **kwargs)
def SetNormalColour(*args, **kwargs):
"""SetNormalColour(self, Colour colour)"""
return _controls_.HyperlinkCtrl_SetNormalColour(*args, **kwargs)
def GetVisitedColour(*args, **kwargs):
"""GetVisitedColour(self) -> Colour"""
return _controls_.HyperlinkCtrl_GetVisitedColour(*args, **kwargs)
def SetVisitedColour(*args, **kwargs):
"""SetVisitedColour(self, Colour colour)"""
return _controls_.HyperlinkCtrl_SetVisitedColour(*args, **kwargs)
def GetURL(*args, **kwargs):
"""GetURL(self) -> String"""
return _controls_.HyperlinkCtrl_GetURL(*args, **kwargs)
def SetURL(*args, **kwargs):
"""SetURL(self, String url)"""
return _controls_.HyperlinkCtrl_SetURL(*args, **kwargs)
def SetVisited(*args, **kwargs):
"""SetVisited(self, bool visited=True)"""
return _controls_.HyperlinkCtrl_SetVisited(*args, **kwargs)
def GetVisited(*args, **kwargs):
"""GetVisited(self) -> bool"""
return _controls_.HyperlinkCtrl_GetVisited(*args, **kwargs)
_controls_.HyperlinkCtrl_swigregister(HyperlinkCtrl)
HyperlinkCtrlNameStr = cvar.HyperlinkCtrlNameStr
def PreHyperlinkCtrl(*args, **kwargs):
"""
PreHyperlinkCtrl() -> HyperlinkCtrl
A static text control that emulates a hyperlink. The link is displayed
in an appropriate text style, derived from the control's normal font.
When the mouse rolls over the link, the cursor changes to a hand and
the link's color changes to the active color.
Clicking on the link does not launch a web browser; instead, a
wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
events.
"""
val = _controls_.new_PreHyperlinkCtrl(*args, **kwargs)
return val
wxEVT_COMMAND_HYPERLINK = _controls_.wxEVT_COMMAND_HYPERLINK
class HyperlinkEvent(_core.CommandEvent):
"""Proxy of C++ HyperlinkEvent class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, Object generator, int id, String url) -> HyperlinkEvent"""
_controls_.HyperlinkEvent_swiginit(self,_controls_.new_HyperlinkEvent(*args, **kwargs))
def GetURL(*args, **kwargs):
"""GetURL(self) -> String"""
return _controls_.HyperlinkEvent_GetURL(*args, **kwargs)
def SetURL(*args, **kwargs):
"""SetURL(self, String url)"""
return _controls_.HyperlinkEvent_SetURL(*args, **kwargs)
_controls_.HyperlinkEvent_swigregister(HyperlinkEvent)
EVT_HYPERLINK = wx.PyEventBinder( wxEVT_COMMAND_HYPERLINK, 1 )
wxPython/src/mac/_controls_wrap.cpp
+1201 -161
View File
File diff suppressed because one or more lines are too long
wxPython/src/mac/_core.py
+28 -31
View File
@@ -271,13 +271,6 @@ ID_ZOOM_OUT = _core_.ID_ZOOM_OUT
ID_UNDELETE = _core_.ID_UNDELETE
ID_REVERT_TO_SAVED = _core_.ID_REVERT_TO_SAVED
ID_HIGHEST = _core_.ID_HIGHEST
OPEN = _core_.OPEN
SAVE = _core_.SAVE
HIDE_READONLY = _core_.HIDE_READONLY
OVERWRITE_PROMPT = _core_.OVERWRITE_PROMPT
FILE_MUST_EXIST = _core_.FILE_MUST_EXIST
MULTIPLE = _core_.MULTIPLE
CHANGE_DIR = _core_.CHANGE_DIR
ACCEL_ALT = _core_.ACCEL_ALT
ACCEL_CTRL = _core_.ACCEL_CTRL
ACCEL_SHIFT = _core_.ACCEL_SHIFT
@@ -290,9 +283,6 @@ PD_ESTIMATED_TIME = _core_.PD_ESTIMATED_TIME
PD_REMAINING_TIME = _core_.PD_REMAINING_TIME
PD_SMOOTH = _core_.PD_SMOOTH
PD_CAN_SKIP = _core_.PD_CAN_SKIP
DD_NEW_DIR_BUTTON = _core_.DD_NEW_DIR_BUTTON
DD_DEFAULT_STYLE = _core_.DD_DEFAULT_STYLE
DD_CHANGE_DIR = _core_.DD_CHANGE_DIR
MENU_TEAROFF = _core_.MENU_TEAROFF
MB_DOCKABLE = _core_.MB_DOCKABLE
NO_FULL_REPAINT_ON_RESIZE = _core_.NO_FULL_REPAINT_ON_RESIZE
@@ -3501,7 +3491,6 @@ wxEVT_CLOSE_WINDOW = _core_.wxEVT_CLOSE_WINDOW
wxEVT_END_SESSION = _core_.wxEVT_END_SESSION
wxEVT_QUERY_END_SESSION = _core_.wxEVT_QUERY_END_SESSION
wxEVT_ACTIVATE_APP = _core_.wxEVT_ACTIVATE_APP
wxEVT_POWER = _core_.wxEVT_POWER
wxEVT_ACTIVATE = _core_.wxEVT_ACTIVATE
wxEVT_CREATE = _core_.wxEVT_CREATE
wxEVT_DESTROY = _core_.wxEVT_DESTROY
@@ -3557,7 +3546,7 @@ EVT_ERASE_BACKGROUND = wx.PyEventBinder( wxEVT_ERASE_BACKGROUND )
EVT_CHAR = wx.PyEventBinder( wxEVT_CHAR )
EVT_KEY_DOWN = wx.PyEventBinder( wxEVT_KEY_DOWN )
EVT_KEY_UP = wx.PyEventBinder( wxEVT_KEY_UP )
EVT_HOTKEY = wx.PyEventBinder( wxEVT_HOTKEY, 1)
EVT_HOTKEY = wx.PyEventBinder( wxEVT_HOTKEY, 1)
EVT_CHAR_HOOK = wx.PyEventBinder( wxEVT_CHAR_HOOK )
EVT_MENU_OPEN = wx.PyEventBinder( wxEVT_MENU_OPEN )
EVT_MENU_CLOSE = wx.PyEventBinder( wxEVT_MENU_CLOSE )
@@ -3568,7 +3557,7 @@ EVT_KILL_FOCUS = wx.PyEventBinder( wxEVT_KILL_FOCUS )
EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )
EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )
EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )
EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )
@@ -3617,11 +3606,11 @@ EVT_MOUSE_EVENTS = wx.PyEventBinder([ wxEVT_LEFT_DOWN,
# Scrolling from wxWindow (sent to wxScrolledWindow)
EVT_SCROLLWIN = wx.PyEventBinder([ wxEVT_SCROLLWIN_TOP,
EVT_SCROLLWIN = wx.PyEventBinder([ wxEVT_SCROLLWIN_TOP,
wxEVT_SCROLLWIN_BOTTOM,
wxEVT_SCROLLWIN_LINEUP,
wxEVT_SCROLLWIN_LINEDOWN,
wxEVT_SCROLLWIN_PAGEUP,
wxEVT_SCROLLWIN_PAGEUP,
wxEVT_SCROLLWIN_PAGEDOWN,
wxEVT_SCROLLWIN_THUMBTRACK,
wxEVT_SCROLLWIN_THUMBRELEASE,
@@ -3637,14 +3626,14 @@ EVT_SCROLLWIN_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBTRACK )
EVT_SCROLLWIN_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBRELEASE )
# Scrolling from wx.Slider and wx.ScrollBar
EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
wxEVT_SCROLL_THUMBRELEASE,
EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
wxEVT_SCROLL_THUMBRELEASE,
wxEVT_SCROLL_CHANGED,
])
@@ -3658,15 +3647,15 @@ EVT_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK )
EVT_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE )
EVT_SCROLL_CHANGED = wx.PyEventBinder( wxEVT_SCROLL_CHANGED )
EVT_SCROLL_ENDSCROLL = EVT_SCROLL_CHANGED
# Scrolling from wx.Slider and wx.ScrollBar, with an id
EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
wxEVT_SCROLL_THUMBRELEASE,
wxEVT_SCROLL_CHANGED,
], 1)
@@ -8403,6 +8392,14 @@ class Window(EvtHandler):
"""
return _core_.Window_RemoveChild(*args, **kwargs)
def SetDoubleBuffered(*args, **kwargs):
"""
SetDoubleBuffered(self, bool on)
Currently wxGTK2 only.
"""
return _core_.Window_SetDoubleBuffered(*args, **kwargs)
def FindWindowById(*args, **kwargs):
"""
FindWindowById(self, long winid) -> Window
wxPython/src/mac/_core_wrap.cpp
+40 -11
View File
@@ -3791,6 +3791,7 @@ SWIGINTERN PyObject *wxWindow_GetChildren(wxWindow *self){
wxWindowList& list = self->GetChildren();
return wxPy_ConvertList(&list);
}
SWIGINTERN void wxWindow_SetDoubleBuffered(wxWindow *self,bool on){}
SWIGINTERN bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keycode){
#if wxUSE_HOTKEY
return self->RegisterHotKey(hotkeyId, modifiers, keycode);
@@ -33196,6 +33197,44 @@ fail:
}
SWIGINTERN PyObject *_wrap_Window_SetDoubleBuffered(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
bool arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
bool val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "on", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDoubleBuffered",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_SetDoubleBuffered" "', expected argument " "1"" of type '" "wxWindow *""'");
}
arg1 = reinterpret_cast< wxWindow * >(argp1);
ecode2 = SWIG_AsVal_bool(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Window_SetDoubleBuffered" "', expected argument " "2"" of type '" "bool""'");
}
arg2 = static_cast< bool >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxWindow_SetDoubleBuffered(arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Window_FindWindowById(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
@@ -53460,6 +53499,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Window_Reparent", (PyCFunction) _wrap_Window_Reparent, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_AddChild", (PyCFunction) _wrap_Window_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_RemoveChild", (PyCFunction) _wrap_Window_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_SetDoubleBuffered", (PyCFunction) _wrap_Window_SetDoubleBuffered, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_FindWindowById", (PyCFunction) _wrap_Window_FindWindowById, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_FindWindowByName", (PyCFunction) _wrap_Window_FindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_GetEventHandler", (PyCFunction)_wrap_Window_GetEventHandler, METH_O, NULL},
@@ -55727,13 +55767,6 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "ID_UNDELETE",SWIG_From_int(static_cast< int >(wxID_UNDELETE)));
SWIG_Python_SetConstant(d, "ID_REVERT_TO_SAVED",SWIG_From_int(static_cast< int >(wxID_REVERT_TO_SAVED)));
SWIG_Python_SetConstant(d, "ID_HIGHEST",SWIG_From_int(static_cast< int >(wxID_HIGHEST)));
SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
SWIG_Python_SetConstant(d, "HIDE_READONLY",SWIG_From_int(static_cast< int >(wxHIDE_READONLY)));
SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST)));
SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE)));
SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR)));
SWIG_Python_SetConstant(d, "ACCEL_ALT",SWIG_From_int(static_cast< int >(wxACCEL_ALT)));
SWIG_Python_SetConstant(d, "ACCEL_CTRL",SWIG_From_int(static_cast< int >(wxACCEL_CTRL)));
SWIG_Python_SetConstant(d, "ACCEL_SHIFT",SWIG_From_int(static_cast< int >(wxACCEL_SHIFT)));
@@ -55746,9 +55779,6 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "PD_REMAINING_TIME",SWIG_From_int(static_cast< int >(wxPD_REMAINING_TIME)));
SWIG_Python_SetConstant(d, "PD_SMOOTH",SWIG_From_int(static_cast< int >(wxPD_SMOOTH)));
SWIG_Python_SetConstant(d, "PD_CAN_SKIP",SWIG_From_int(static_cast< int >(wxPD_CAN_SKIP)));
SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "MENU_TEAROFF",SWIG_From_int(static_cast< int >(wxMENU_TEAROFF)));
SWIG_Python_SetConstant(d, "MB_DOCKABLE",SWIG_From_int(static_cast< int >(wxMB_DOCKABLE)));
SWIG_Python_SetConstant(d, "NO_FULL_REPAINT_ON_RESIZE",SWIG_From_int(static_cast< int >(wxNO_FULL_REPAINT_ON_RESIZE)));
@@ -56328,7 +56358,6 @@ SWIGEXPORT void SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_END_SESSION", PyInt_FromLong(wxEVT_END_SESSION));
PyDict_SetItemString(d, "wxEVT_QUERY_END_SESSION", PyInt_FromLong(wxEVT_QUERY_END_SESSION));
PyDict_SetItemString(d, "wxEVT_ACTIVATE_APP", PyInt_FromLong(wxEVT_ACTIVATE_APP));
PyDict_SetItemString(d, "wxEVT_POWER", PyInt_FromLong(wxEVT_POWER));
PyDict_SetItemString(d, "wxEVT_ACTIVATE", PyInt_FromLong(wxEVT_ACTIVATE));
PyDict_SetItemString(d, "wxEVT_CREATE", PyInt_FromLong(wxEVT_CREATE));
PyDict_SetItemString(d, "wxEVT_DESTROY", PyInt_FromLong(wxEVT_DESTROY));
wxPython/src/mac/_gdi.py
+127 -63
View File
@@ -1288,7 +1288,7 @@ class NativeFontInfo(object):
return _gdi_.NativeFontInfo_SetUnderlined(*args, **kwargs)
def SetFaceName(*args, **kwargs):
"""SetFaceName(self, String facename)"""
"""SetFaceName(self, String facename) -> bool"""
return _gdi_.NativeFontInfo_SetFaceName(*args, **kwargs)
def SetFamily(*args, **kwargs):
@@ -1679,7 +1679,7 @@ class Font(GDIObject):
def SetFaceName(*args, **kwargs):
"""
SetFaceName(self, String faceName)
SetFaceName(self, String faceName) -> bool
Sets the facename for the font. The facename, which should be a valid
font installed on the end-user's system.
@@ -1718,7 +1718,7 @@ class Font(GDIObject):
def SetNativeFontInfoFromString(*args, **kwargs):
"""
SetNativeFontInfoFromString(self, String info)
SetNativeFontInfoFromString(self, String info) -> bool
Set the font's attributes from string representation of a
`wx.NativeFontInfo` object.
@@ -1727,7 +1727,7 @@ class Font(GDIObject):
def SetNativeFontInfoUserDesc(*args, **kwargs):
"""
SetNativeFontInfoUserDesc(self, String info)
SetNativeFontInfoUserDesc(self, String info) -> bool
Set the font's attributes from a string formerly returned from
`GetNativeFontInfoDesc`.
@@ -1910,15 +1910,44 @@ class FontEnumerator(object):
return _gdi_.FontEnumerator_EnumerateEncodings(*args, **kwargs)
def GetEncodings(*args, **kwargs):
"""GetEncodings(self) -> PyObject"""
"""GetEncodings() -> PyObject"""
return _gdi_.FontEnumerator_GetEncodings(*args, **kwargs)
GetEncodings = staticmethod(GetEncodings)
def GetFacenames(*args, **kwargs):
"""GetFacenames(self) -> PyObject"""
"""GetFacenames() -> PyObject"""
return _gdi_.FontEnumerator_GetFacenames(*args, **kwargs)
GetFacenames = staticmethod(GetFacenames)
def IsValidFacename(*args, **kwargs):
"""
IsValidFacename(String str) -> bool
Convenience function that returns true if the given face name exist in
the user's system
"""
return _gdi_.FontEnumerator_IsValidFacename(*args, **kwargs)
IsValidFacename = staticmethod(IsValidFacename)
_gdi_.FontEnumerator_swigregister(FontEnumerator)
def FontEnumerator_GetEncodings(*args):
"""FontEnumerator_GetEncodings() -> PyObject"""
return _gdi_.FontEnumerator_GetEncodings(*args)
def FontEnumerator_GetFacenames(*args):
"""FontEnumerator_GetFacenames() -> PyObject"""
return _gdi_.FontEnumerator_GetFacenames(*args)
def FontEnumerator_IsValidFacename(*args, **kwargs):
"""
FontEnumerator_IsValidFacename(String str) -> bool
Convenience function that returns true if the given face name exist in
the user's system
"""
return _gdi_.FontEnumerator_IsValidFacename(*args, **kwargs)
#---------------------------------------------------------------------------
LANGUAGE_DEFAULT = _gdi_.LANGUAGE_DEFAULT
@@ -4423,44 +4452,50 @@ class StockGDI(object):
def _initStockObjects():
import wx
wx.ITALIC_FONT = StockGDI.instance().GetFont(StockGDI.FONT_ITALIC)
wx.NORMAL_FONT = StockGDI.instance().GetFont(StockGDI.FONT_NORMAL)
wx.SMALL_FONT = StockGDI.instance().GetFont(StockGDI.FONT_SMALL)
wx.SWISS_FONT = StockGDI.instance().GetFont(StockGDI.FONT_SWISS)
wx.ITALIC_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_ITALIC).this
wx.NORMAL_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_NORMAL).this
wx.SMALL_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_SMALL).this
wx.SWISS_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_SWISS).this
wx.BLACK_DASHED_PEN = StockGDI.GetPen(StockGDI.PEN_BLACKDASHED)
wx.BLACK_PEN = StockGDI.GetPen(StockGDI.PEN_BLACK)
wx.CYAN_PEN = StockGDI.GetPen(StockGDI.PEN_CYAN)
wx.GREEN_PEN = StockGDI.GetPen(StockGDI.PEN_GREEN)
wx.GREY_PEN = StockGDI.GetPen(StockGDI.PEN_GREY)
wx.LIGHT_GREY_PEN = StockGDI.GetPen(StockGDI.PEN_LIGHTGREY)
wx.MEDIUM_GREY_PEN = StockGDI.GetPen(StockGDI.PEN_MEDIUMGREY)
wx.RED_PEN = StockGDI.GetPen(StockGDI.PEN_RED)
wx.TRANSPARENT_PEN = StockGDI.GetPen(StockGDI.PEN_TRANSPARENT)
wx.WHITE_PEN = StockGDI.GetPen(StockGDI.PEN_WHITE)
wx.BLACK_DASHED_PEN.this = StockGDI.GetPen(StockGDI.PEN_BLACKDASHED).this
wx.BLACK_PEN.this = StockGDI.GetPen(StockGDI.PEN_BLACK).this
wx.CYAN_PEN.this = StockGDI.GetPen(StockGDI.PEN_CYAN).this
wx.GREEN_PEN.this = StockGDI.GetPen(StockGDI.PEN_GREEN).this
wx.GREY_PEN.this = StockGDI.GetPen(StockGDI.PEN_GREY).this
wx.LIGHT_GREY_PEN.this = StockGDI.GetPen(StockGDI.PEN_LIGHTGREY).this
wx.MEDIUM_GREY_PEN.this = StockGDI.GetPen(StockGDI.PEN_MEDIUMGREY).this
wx.RED_PEN.this = StockGDI.GetPen(StockGDI.PEN_RED).this
wx.TRANSPARENT_PEN.this = StockGDI.GetPen(StockGDI.PEN_TRANSPARENT).this
wx.WHITE_PEN.this = StockGDI.GetPen(StockGDI.PEN_WHITE).this
wx.BLACK_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_BLACK)
wx.BLUE_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_BLUE)
wx.CYAN_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_CYAN)
wx.GREEN_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_GREEN)
wx.GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_GREY)
wx.LIGHT_GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_LIGHTGREY)
wx.MEDIUM_GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_MEDIUMGREY)
wx.RED_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_RED)
wx.TRANSPARENT_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_TRANSPARENT)
wx.WHITE_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_WHITE)
wx.BLACK_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_BLACK).this
wx.BLUE_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_BLUE).this
wx.CYAN_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_CYAN).this
wx.GREEN_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_GREEN).this
wx.GREY_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_GREY).this
wx.LIGHT_GREY_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_LIGHTGREY).this
wx.MEDIUM_GREY_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_MEDIUMGREY).this
wx.RED_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_RED).this
wx.TRANSPARENT_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_TRANSPARENT).this
wx.WHITE_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_WHITE).this
wx.BLACK = StockGDI.GetColour(StockGDI.COLOUR_BLACK)
wx.BLUE = StockGDI.GetColour(StockGDI.COLOUR_BLUE)
wx.CYAN = StockGDI.GetColour(StockGDI.COLOUR_CYAN)
wx.GREEN = StockGDI.GetColour(StockGDI.COLOUR_GREEN)
wx.LIGHT_GREY = StockGDI.GetColour(StockGDI.COLOUR_LIGHTGREY)
wx.RED = StockGDI.GetColour(StockGDI.COLOUR_RED)
wx.WHITE = StockGDI.GetColour(StockGDI.COLOUR_WHITE)
wx.BLACK.this = StockGDI.GetColour(StockGDI.COLOUR_BLACK).this
wx.BLUE.this = StockGDI.GetColour(StockGDI.COLOUR_BLUE).this
wx.CYAN.this = StockGDI.GetColour(StockGDI.COLOUR_CYAN).this
wx.GREEN.this = StockGDI.GetColour(StockGDI.COLOUR_GREEN).this
wx.LIGHT_GREY.this = StockGDI.GetColour(StockGDI.COLOUR_LIGHTGREY).this
wx.RED.this = StockGDI.GetColour(StockGDI.COLOUR_RED).this
wx.WHITE.this = StockGDI.GetColour(StockGDI.COLOUR_WHITE).this
wx.CROSS_CURSOR.this = StockGDI.GetCursor(StockGDI.CURSOR_CROSS).this
wx.HOURGLASS_CURSOR.this = StockGDI.GetCursor(StockGDI.CURSOR_HOURGLASS).this
wx.STANDARD_CURSOR.this = StockGDI.GetCursor(StockGDI.CURSOR_STANDARD).this
wx.TheFontList.this = _wxPyInitTheFontList().this
wx.ThePenList.this = _wxPyInitThePenList().this
wx.TheBrushList.this = _wxPyInitTheBrushList().this
wx.TheColourDatabase.this = _wxPyInitTheColourDatabase().this
wx.CROSS_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_CROSS)
wx.HOURGLASS_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_HOURGLASS)
wx.STANDARD_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_STANDARD)
_initStockObjects = staticmethod(_initStockObjects)
@@ -4490,6 +4525,47 @@ def StockGDI_GetPen(*args, **kwargs):
"""StockGDI_GetPen(int item) -> Pen"""
return _gdi_.StockGDI_GetPen(*args, **kwargs)
# Create an uninitialized instance for the stock objects, they will
# be initialized later when the wx.App object is created.
ITALIC_FONT = Font.__new__(Font)
NORMAL_FONT = Font.__new__(Font)
SMALL_FONT = Font.__new__(Font)
SWISS_FONT = Font.__new__(Font)
BLACK_DASHED_PEN = Pen.__new__(Pen)
BLACK_PEN = Pen.__new__(Pen)
CYAN_PEN = Pen.__new__(Pen)
GREEN_PEN = Pen.__new__(Pen)
GREY_PEN = Pen.__new__(Pen)
LIGHT_GREY_PEN = Pen.__new__(Pen)
MEDIUM_GREY_PEN = Pen.__new__(Pen)
RED_PEN = Pen.__new__(Pen)
TRANSPARENT_PEN = Pen.__new__(Pen)
WHITE_PEN = Pen.__new__(Pen)
BLACK_BRUSH = Brush.__new__(Brush)
BLUE_BRUSH = Brush.__new__(Brush)
CYAN_BRUSH = Brush.__new__(Brush)
GREEN_BRUSH = Brush.__new__(Brush)
GREY_BRUSH = Brush.__new__(Brush)
LIGHT_GREY_BRUSH = Brush.__new__(Brush)
MEDIUM_GREY_BRUSH = Brush.__new__(Brush)
RED_BRUSH = Brush.__new__(Brush)
TRANSPARENT_BRUSH = Brush.__new__(Brush)
WHITE_BRUSH = Brush.__new__(Brush)
BLACK = Colour.__new__(Colour)
BLUE = Colour.__new__(Colour)
CYAN = Colour.__new__(Colour)
GREEN = Colour.__new__(Colour)
LIGHT_GREY = Colour.__new__(Colour)
RED = Colour.__new__(Colour)
WHITE = Colour.__new__(Colour)
CROSS_CURSOR = Cursor.__new__(Cursor)
HOURGLASS_CURSOR = Cursor.__new__(Cursor)
STANDARD_CURSOR = Cursor.__new__(Cursor)
class GDIObjListBase(object):
"""Proxy of C++ GDIObjListBase class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -4626,29 +4702,12 @@ def _wxPyInitTheBrushList(*args):
def _wxPyInitTheColourDatabase(*args):
"""_wxPyInitTheColourDatabase() -> ColourDatabase"""
return _gdi_._wxPyInitTheColourDatabase(*args)
# This function makes a class used to do delayed initialization of some
# stock wx objects. When they are used the first time then an init function
# is called to make the real instance, which is then used to replace the
# original instance and class seen by the programmer.
def _wxPyMakeDelayedInitWrapper(initFunc):
class _wxPyStockObjectWrapper(object):
def __init__(self, *args):
self._args = args
def __getattr__(self, name):
obj = initFunc(*self._args)
self.__class__ = obj.__class__
self.__dict__ = obj.__dict__
return getattr(self, name)
def __str__(self):
return self.__getattr__("__str__")()
def __repr__(self):
return self.__getattr__("__repr__")()
return _wxPyStockObjectWrapper
TheFontList = _wxPyMakeDelayedInitWrapper(_wxPyInitTheFontList)()
ThePenList = _wxPyMakeDelayedInitWrapper(_wxPyInitThePenList)()
TheBrushList = _wxPyMakeDelayedInitWrapper(_wxPyInitTheBrushList)()
TheColourDatabase = _wxPyMakeDelayedInitWrapper(_wxPyInitTheColourDatabase)()
# Create an uninitialized instance for the stock objects, they will
# be initialized later when the wx.App object is created.
TheFontList = FontList.__new__(FontList)
ThePenList = PenList.__new__(PenList)
TheBrushList = BrushList.__new__(BrushList)
TheColourDatabase = ColourDatabase.__new__(ColourDatabase)
NullColor = NullColour
#---------------------------------------------------------------------------
@@ -4817,6 +4876,11 @@ class RendererNative(object):
genereic controls in ways that are as close to the native look as
possible.
Note that each drawing function restores the `wx.DC` attributes if it
changes them, so it is safe to assume that the same pen, brush and
colours that were active before the call to this function are still in
effect after it.
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
wxPython/src/mac/_gdi_wrap.cpp
+76 -46
View File
@@ -3099,25 +3099,19 @@ IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFacename);
IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);
SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){
SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(){
PyObject* ret;
wxArrayString* arr = self->GetEncodings();
wxArrayString arr = wxFontEnumerator::GetEncodings();
wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (arr)
ret = wxArrayString2PyList_helper(*arr);
else
ret = PyList_New(0);
ret = wxArrayString2PyList_helper(arr);
wxPyEndBlockThreads(blocked);
return ret;
}
SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(){
PyObject* ret;
wxArrayString* arr = self->GetFacenames();
wxArrayString arr = wxFontEnumerator::GetFacenames();
wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (arr)
ret = wxArrayString2PyList_helper(*arr);
else
ret = PyList_New(0);
ret = wxArrayString2PyList_helper(arr);
wxPyEndBlockThreads(blocked);
return ret;
}
@@ -9828,6 +9822,7 @@ SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *SWIGUNUSEDPARM(s
PyObject *resultobj = 0;
wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
wxString arg2 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject * obj0 = 0 ;
@@ -9850,11 +9845,13 @@ SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *SWIGUNUSEDPARM(s
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetFaceName(arg2);
result = (bool)(arg1)->SetFaceName(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
@@ -12217,6 +12214,7 @@ SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyOb
PyObject *resultobj = 0;
wxFont *arg1 = (wxFont *) 0 ;
wxString *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
bool temp2 = false ;
@@ -12239,11 +12237,13 @@ SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetFaceName((wxString const &)*arg2);
result = (bool)(arg1)->SetFaceName((wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp2)
delete arg2;
@@ -12379,6 +12379,7 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *SWIGUNUSED
PyObject *resultobj = 0;
wxFont *arg1 = (wxFont *) 0 ;
wxString *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
bool temp2 = false ;
@@ -12401,11 +12402,13 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *SWIGUNUSED
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetNativeFontInfo((wxString const &)*arg2);
result = (bool)(arg1)->SetNativeFontInfo((wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp2)
delete arg2;
@@ -12424,6 +12427,7 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPA
PyObject *resultobj = 0;
wxFont *arg1 = (wxFont *) 0 ;
wxString *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
bool temp2 = false ;
@@ -12446,11 +12450,13 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPA
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetNativeFontInfoUserDesc((wxString const &)*arg2);
result = (bool)(arg1)->SetNativeFontInfoUserDesc((wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp2)
delete arg2;
@@ -12895,22 +12901,12 @@ fail:
SWIGINTERN PyObject *_wrap_FontEnumerator_GetEncodings(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
PyObject *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_GetEncodings" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'");
}
arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetEncodings",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (PyObject *)wxPyFontEnumerator_GetEncodings(arg1);
result = (PyObject *)wxPyFontEnumerator_GetEncodings();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -12923,22 +12919,12 @@ fail:
SWIGINTERN PyObject *_wrap_FontEnumerator_GetFacenames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
PyObject *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_GetFacenames" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'");
}
arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetFacenames",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (PyObject *)wxPyFontEnumerator_GetFacenames(arg1);
result = (PyObject *)wxPyFontEnumerator_GetFacenames();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -12949,6 +12935,45 @@ fail:
}
SWIGINTERN PyObject *_wrap_FontEnumerator_IsValidFacename(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxString *arg1 = 0 ;
bool result;
bool temp1 = false ;
PyObject * obj0 = 0 ;
char * kwnames[] = {
(char *) "str", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontEnumerator_IsValidFacename",kwnames,&obj0)) SWIG_fail;
{
arg1 = wxString_in_helper(obj0);
if (arg1 == NULL) SWIG_fail;
temp1 = true;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)wxPyFontEnumerator::IsValidFacename((wxString const &)*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp1)
delete arg1;
}
return resultobj;
fail:
{
if (temp1)
delete arg1;
}
return NULL;
}
SWIGINTERN PyObject *FontEnumerator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -24922,6 +24947,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_Get(PyObject *SWIGUNUSEDPARM(self), Py
if (!SWIG_Python_UnpackTuple(args,"RendererNative_Get",0,0,0)) SWIG_fail;
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRendererNative &_result_ref = wxRendererNative::Get();
@@ -24943,6 +24969,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_GetGeneric(PyObject *SWIGUNUSEDPARM(se
if (!SWIG_Python_UnpackTuple(args,"RendererNative_GetGeneric",0,0,0)) SWIG_fail;
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRendererNative &_result_ref = wxRendererNative::GetGeneric();
@@ -24964,6 +24991,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_GetDefault(PyObject *SWIGUNUSEDPARM(se
if (!SWIG_Python_UnpackTuple(args,"RendererNative_GetDefault",0,0,0)) SWIG_fail;
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRendererNative &_result_ref = wxRendererNative::GetDefault();
@@ -24997,6 +25025,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_Set(PyObject *SWIGUNUSEDPARM(self), Py
}
arg1 = reinterpret_cast< wxRendererNative * >(argp1);
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxRendererNative *)wxRendererNative::Set(arg1);
wxPyEndAllowThreads(__tstate);
@@ -25334,8 +25363,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FontEnumerator__setCallbackInfo", (PyCFunction) _wrap_FontEnumerator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_EnumerateFacenames", (PyCFunction) _wrap_FontEnumerator_EnumerateFacenames, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_EnumerateEncodings", (PyCFunction) _wrap_FontEnumerator_EnumerateEncodings, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_GetEncodings", (PyCFunction)_wrap_FontEnumerator_GetEncodings, METH_O, NULL},
{ (char *)"FontEnumerator_GetFacenames", (PyCFunction)_wrap_FontEnumerator_GetFacenames, METH_O, NULL},
{ (char *)"FontEnumerator_GetEncodings", (PyCFunction)_wrap_FontEnumerator_GetEncodings, METH_NOARGS, NULL},
{ (char *)"FontEnumerator_GetFacenames", (PyCFunction)_wrap_FontEnumerator_GetFacenames, METH_NOARGS, NULL},
{ (char *)"FontEnumerator_IsValidFacename", (PyCFunction) _wrap_FontEnumerator_IsValidFacename, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_swigregister", FontEnumerator_swigregister, METH_VARARGS, NULL},
{ (char *)"FontEnumerator_swiginit", FontEnumerator_swiginit, METH_VARARGS, NULL},
{ (char *)"LanguageInfo_Language_set", _wrap_LanguageInfo_Language_set, METH_VARARGS, NULL},
wxPython/src/mac/_misc.py
+61 -1
View File
@@ -432,7 +432,7 @@ def SaveFileSelector(*args, **kwargs):
def DirSelector(*args, **kwargs):
"""
DirSelector(String message=DirSelectorPromptStr, String defaultPath=EmptyString,
long style=DD_DEFAULT_STYLE,
long style=wxDD_DEFAULT_STYLE,
Point pos=DefaultPosition, Window parent=None) -> String
"""
return _misc_.DirSelector(*args, **kwargs)
@@ -5776,5 +5776,65 @@ def StandardPaths_Get(*args):
"""
return _misc_.StandardPaths_Get(*args)
#---------------------------------------------------------------------------
POWER_SOCKET = _misc_.POWER_SOCKET
POWER_BATTERY = _misc_.POWER_BATTERY
POWER_UNKNOWN = _misc_.POWER_UNKNOWN
BATTERY_NORMAL_STATE = _misc_.BATTERY_NORMAL_STATE
BATTERY_LOW_STATE = _misc_.BATTERY_LOW_STATE
BATTERY_CRITICAL_STATE = _misc_.BATTERY_CRITICAL_STATE
BATTERY_SHUTDOWN_STATE = _misc_.BATTERY_SHUTDOWN_STATE
BATTERY_UNKNOWN_STATE = _misc_.BATTERY_UNKNOWN_STATE
class PowerEvent(_core.Event):
"""
wx.PowerEvent is generated when the system online status changes.
Currently this is only implemented for Windows.
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, EventType evtType) -> PowerEvent
wx.PowerEvent is generated when the system online status changes.
Currently this is only implemented for Windows.
"""
_misc_.PowerEvent_swiginit(self,_misc_.new_PowerEvent(*args, **kwargs))
def Veto(*args, **kwargs):
"""Veto(self)"""
return _misc_.PowerEvent_Veto(*args, **kwargs)
def IsVetoed(*args, **kwargs):
"""IsVetoed(self) -> bool"""
return _misc_.PowerEvent_IsVetoed(*args, **kwargs)
_misc_.PowerEvent_swigregister(PowerEvent)
wxEVT_POWER_SUSPENDING = _misc_.wxEVT_POWER_SUSPENDING
wxEVT_POWER_SUSPENDED = _misc_.wxEVT_POWER_SUSPENDED
wxEVT_POWER_SUSPEND_CANCEL = _misc_.wxEVT_POWER_SUSPEND_CANCEL
wxEVT_POWER_RESUME = _misc_.wxEVT_POWER_RESUME
EVT_POWER_SUSPENDING = wx.PyEventBinder( wxEVT_POWER_SUSPENDING , 1 )
EVT_POWER_SUSPENDED = wx.PyEventBinder( wxEVT_POWER_SUSPENDED , 1 )
EVT_POWER_SUSPEND_CANCEL = wx.PyEventBinder( wxEVT_POWER_SUSPEND_CANCEL , 1 )
EVT_POWER_RESUME = wx.PyEventBinder( wxEVT_POWER_RESUME , 1 )
def GetPowerType(*args):
"""
GetPowerType() -> int
return the current system power state: online or offline
"""
return _misc_.GetPowerType(*args)
def GetBatteryState(*args):
"""
GetBatteryState() -> int
return approximate battery state
"""
return _misc_.GetBatteryState(*args)
wxPython/src/mac/_misc_wrap.cpp
+256 -63
View File
File diff suppressed because one or more lines are too long
wxPython/src/mac/_windows.py
+21 -20
View File
@@ -2119,6 +2119,9 @@ def GetColourFromUser(*args, **kwargs):
String caption=EmptyString) -> Colour
"""
return _windows_.GetColourFromUser(*args, **kwargs)
DD_NEW_DIR_BUTTON = _windows_.DD_NEW_DIR_BUTTON
DD_DEFAULT_STYLE = _windows_.DD_DEFAULT_STYLE
DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
class DirDialog(Dialog):
"""
wx.DirDialog allows the user to select a directory by browising the
@@ -2129,7 +2132,7 @@ class DirDialog(Dialog):
def __init__(self, *args, **kwargs):
"""
__init__(self, Window parent, String message=DirSelectorPromptStr,
String defaultPath=EmptyString, long style=0,
String defaultPath=EmptyString, long style=DD_DEFAULT_STYLE,
Point pos=DefaultPosition, Size size=DefaultSize,
String name=DirDialogNameStr) -> DirDialog
@@ -2172,6 +2175,19 @@ class DirDialog(Dialog):
_windows_.DirDialog_swigregister(DirDialog)
OPEN = _windows_.OPEN
SAVE = _windows_.SAVE
OVERWRITE_PROMPT = _windows_.OVERWRITE_PROMPT
FILE_MUST_EXIST = _windows_.FILE_MUST_EXIST
MULTIPLE = _windows_.MULTIPLE
CHANGE_DIR = _windows_.CHANGE_DIR
FD_OPEN = _windows_.FD_OPEN
FD_SAVE = _windows_.FD_SAVE
FD_OVERWRITE_PROMPT = _windows_.FD_OVERWRITE_PROMPT
FD_FILE_MUST_EXIST = _windows_.FD_FILE_MUST_EXIST
FD_MULTIPLE = _windows_.FD_MULTIPLE
FD_CHANGE_DIR = _windows_.FD_CHANGE_DIR
FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE
class FileDialog(Dialog):
"""
wx.FileDialog allows the user to select one or more files from the
@@ -2184,7 +2200,8 @@ class FileDialog(Dialog):
__init__(self, Window parent, String message=FileSelectorPromptStr,
String defaultDir=EmptyString, String defaultFile=EmptyString,
String wildcard=FileSelectorDefaultWildcardStr,
long style=0, Point pos=DefaultPosition) -> FileDialog
long style=FD_DEFAULT_STYLE,
Point pos=DefaultPosition) -> FileDialog
Constructor. Use ShowModal method to show the dialog.
"""
@@ -2236,14 +2253,6 @@ class FileDialog(Dialog):
"""
return _windows_.FileDialog_SetWildcard(*args, **kwargs)
def SetStyle(*args, **kwargs):
"""
SetStyle(self, long style)
Sets the dialog style.
"""
return _windows_.FileDialog_SetStyle(*args, **kwargs)
def SetFilterIndex(*args, **kwargs):
"""
SetFilterIndex(self, int filterIndex)
@@ -2292,14 +2301,6 @@ class FileDialog(Dialog):
"""
return _windows_.FileDialog_GetWildcard(*args, **kwargs)
def GetStyle(*args, **kwargs):
"""
GetStyle(self) -> long
Returns the dialog style.
"""
return _windows_.FileDialog_GetStyle(*args, **kwargs)
def GetFilterIndex(*args, **kwargs):
"""
GetFilterIndex(self) -> int
@@ -2730,11 +2731,11 @@ EVT_FIND_REPLACE_ALL = wx.PyEventBinder( wxEVT_COMMAND_FIND_REPLACE_ALL, 1 )
EVT_FIND_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_FIND_CLOSE, 1 )
# For backwards compatibility. Should they be removed?
EVT_COMMAND_FIND = EVT_FIND
EVT_COMMAND_FIND = EVT_FIND
EVT_COMMAND_FIND_NEXT = EVT_FIND_NEXT
EVT_COMMAND_FIND_REPLACE = EVT_FIND_REPLACE
EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL
EVT_COMMAND_FIND_CLOSE = EVT_FIND_CLOSE
EVT_COMMAND_FIND_CLOSE = EVT_FIND_CLOSE
class FindDialogEvent(_core.CommandEvent):
"""Events for the FindReplaceDialog"""
wxPython/src/mac/_windows_wrap.cpp
+18 -70
View File
@@ -16500,7 +16500,7 @@ SWIGINTERN PyObject *_wrap_new_DirDialog(PyObject *SWIGUNUSEDPARM(self), PyObjec
wxString *arg2 = (wxString *) &arg2_defvalue ;
wxString const &arg3_defvalue = wxPyEmptyString ;
wxString *arg3 = (wxString *) &arg3_defvalue ;
long arg4 = (long) 0 ;
long arg4 = (long) wxDD_DEFAULT_STYLE ;
wxPoint const &arg5_defvalue = wxDefaultPosition ;
wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
wxSize const &arg6_defvalue = wxDefaultSize ;
@@ -16792,7 +16792,7 @@ SWIGINTERN PyObject *_wrap_new_FileDialog(PyObject *SWIGUNUSEDPARM(self), PyObje
wxString *arg4 = (wxString *) &arg4_defvalue ;
wxString const &arg5_defvalue = wxPyFileSelectorDefaultWildcardStr ;
wxString *arg5 = (wxString *) &arg5_defvalue ;
long arg6 = (long) 0 ;
long arg6 = (long) wxFD_DEFAULT_STYLE ;
wxPoint const &arg7_defvalue = wxDefaultPosition ;
wxPoint *arg7 = (wxPoint *) &arg7_defvalue ;
wxFileDialog *result = 0 ;
@@ -17134,44 +17134,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_FileDialog_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
long arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
long val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "style", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFileDialog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FileDialog_SetStyle" "', expected argument " "1"" of type '" "wxFileDialog *""'");
}
arg1 = reinterpret_cast< wxFileDialog * >(argp1);
ecode2 = SWIG_AsVal_long(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FileDialog_SetStyle" "', expected argument " "2"" of type '" "long""'");
}
arg2 = static_cast< long >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetStyle(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
@@ -17380,34 +17342,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_FileDialog_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
long result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFileDialog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FileDialog_GetStyle" "', expected argument " "1"" of type '" "wxFileDialog const *""'");
}
arg1 = reinterpret_cast< wxFileDialog * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (long)((wxFileDialog const *)arg1)->GetStyle();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_long(static_cast< long >(result));
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_FileDialog_GetFilterIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
@@ -30823,14 +30757,12 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FileDialog_SetDirectory", (PyCFunction) _wrap_FileDialog_SetDirectory, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetFilename", (PyCFunction) _wrap_FileDialog_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetWildcard", (PyCFunction) _wrap_FileDialog_SetWildcard, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetStyle", (PyCFunction) _wrap_FileDialog_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetFilterIndex", (PyCFunction) _wrap_FileDialog_SetFilterIndex, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_GetMessage", (PyCFunction)_wrap_FileDialog_GetMessage, METH_O, NULL},
{ (char *)"FileDialog_GetPath", (PyCFunction)_wrap_FileDialog_GetPath, METH_O, NULL},
{ (char *)"FileDialog_GetDirectory", (PyCFunction)_wrap_FileDialog_GetDirectory, METH_O, NULL},
{ (char *)"FileDialog_GetFilename", (PyCFunction)_wrap_FileDialog_GetFilename, METH_O, NULL},
{ (char *)"FileDialog_GetWildcard", (PyCFunction)_wrap_FileDialog_GetWildcard, METH_O, NULL},
{ (char *)"FileDialog_GetStyle", (PyCFunction)_wrap_FileDialog_GetStyle, METH_O, NULL},
{ (char *)"FileDialog_GetFilterIndex", (PyCFunction)_wrap_FileDialog_GetFilterIndex, METH_O, NULL},
{ (char *)"FileDialog_GetFilenames", (PyCFunction)_wrap_FileDialog_GetFilenames, METH_O, NULL},
{ (char *)"FileDialog_GetPaths", (PyCFunction)_wrap_FileDialog_GetPaths, METH_O, NULL},
@@ -33528,6 +33460,22 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
SWIG_addvarlink(SWIG_globals(),(char*)"GetTextFromUserPromptStr",GetTextFromUserPromptStr_get, GetTextFromUserPromptStr_set);
SWIG_addvarlink(SWIG_globals(),(char*)"MessageBoxCaptionStr",MessageBoxCaptionStr_get, MessageBoxCaptionStr_set);
SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST)));
SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE)));
SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR)));
SWIG_Python_SetConstant(d, "FD_OPEN",SWIG_From_int(static_cast< int >(wxFD_OPEN)));
SWIG_Python_SetConstant(d, "FD_SAVE",SWIG_From_int(static_cast< int >(wxFD_SAVE)));
SWIG_Python_SetConstant(d, "FD_OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxFD_OVERWRITE_PROMPT)));
SWIG_Python_SetConstant(d, "FD_FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFD_FILE_MUST_EXIST)));
SWIG_Python_SetConstant(d, "FD_MULTIPLE",SWIG_From_int(static_cast< int >(wxFD_MULTIPLE)));
SWIG_Python_SetConstant(d, "FD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxFD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "FD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxFD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "CHOICEDLG_STYLE",SWIG_From_int(static_cast< int >(wxCHOICEDLG_STYLE)));
SWIG_Python_SetConstant(d, "TextEntryDialogStyle",SWIG_From_int(static_cast< int >(wxTextEntryDialogStyle)));
SWIG_addvarlink(SWIG_globals(),(char*)"GetPasswordFromUserPromptStr",GetPasswordFromUserPromptStr_get, GetPasswordFromUserPromptStr_set);
wxPython/src/mac/html.py
+2 -6
View File
@@ -686,10 +686,6 @@ class HtmlCell(_core.Object):
"""ProcessMouseClick(self, HtmlWindowInterface window, Point pos, MouseEvent event) -> bool"""
return _html.HtmlCell_ProcessMouseClick(*args, **kwargs)
def AdjustPagebreak(*args, **kwargs):
"""AdjustPagebreak(self, int INOUT) -> bool"""
return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)
def SetCanLiveOnPagebreak(*args, **kwargs):
"""SetCanLiveOnPagebreak(self, bool can)"""
return _html.HtmlCell_SetCanLiveOnPagebreak(*args, **kwargs)
@@ -1197,8 +1193,8 @@ class HtmlDCRenderer(_core.Object):
def Render(*args, **kwargs):
"""
Render(self, int x, int y, int from=0, int dont_render=False, int maxHeight=INT_MAX,
int choices=None, int LCOUNT=0) -> int
Render(self, int x, int y, wxArrayInt known_pagebreaks, int from=0,
int dont_render=False, int to=INT_MAX) -> int
"""
return _html.HtmlDCRenderer_Render(*args, **kwargs)
wxPython/src/mac/html_wrap.cpp
+230 -275
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/_controls.py
+169 -10
View File
@@ -2877,6 +2877,15 @@ class BookCtrlBase(_core.Control):
"""AdvanceSelection(self, bool forward=True)"""
return _controls_.BookCtrlBase_AdvanceSelection(*args, **kwargs)
def HitTest(*args, **kwargs):
"""
HitTest(Point pt) -> (tab, where)
Returns the page/tab which is hit, and flags indicating where using
wx.NB_HITTEST flags.
"""
return _controls_.BookCtrlBase_HitTest(*args, **kwargs)
def GetClassDefaultAttributes(*args, **kwargs):
"""
GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -2992,15 +3001,6 @@ class Notebook(BookCtrlBase):
"""SetTabSize(self, Size sz)"""
return _controls_.Notebook_SetTabSize(*args, **kwargs)
def HitTest(*args, **kwargs):
"""
HitTest(Point pt) -> (tab, where)
Returns the tab which is hit, and flags indicating where using
wx.NB_HITTEST flags.
"""
return _controls_.Notebook_HitTest(*args, **kwargs)
def GetThemeBackgroundColour(*args, **kwargs):
"""GetThemeBackgroundColour(self) -> Colour"""
return _controls_.Notebook_GetThemeBackgroundColour(*args, **kwargs)
@@ -3355,6 +3355,7 @@ TB_NODIVIDER = _controls_.TB_NODIVIDER
TB_NOALIGN = _controls_.TB_NOALIGN
TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
class ToolBarToolBase(_core.Object):
"""Proxy of C++ ToolBarToolBase class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -3915,6 +3916,7 @@ LIST_HITTEST_ONITEMSTATEICON = _controls_.LIST_HITTEST_ONITEMSTATEICON
LIST_HITTEST_TOLEFT = _controls_.LIST_HITTEST_TOLEFT
LIST_HITTEST_TORIGHT = _controls_.LIST_HITTEST_TORIGHT
LIST_HITTEST_ONITEM = _controls_.LIST_HITTEST_ONITEM
LIST_GETSUBITEMRECT_WHOLEITEM = _controls_.LIST_GETSUBITEMRECT_WHOLEITEM
LIST_NEXT_ABOVE = _controls_.LIST_NEXT_ABOVE
LIST_NEXT_ALL = _controls_.LIST_NEXT_ALL
LIST_NEXT_BELOW = _controls_.LIST_NEXT_BELOW
@@ -4502,6 +4504,16 @@ class ListCtrl(_core.Control):
"""
return _controls_.ListCtrl_HitTest(*args, **kwargs)
def HitTestSubItem(*args, **kwargs):
"""
HitTestSubItem(Point point) -> (item, where, subItem)
Determines which item (if any) is at the specified point, giving in
the second return value (see wx.LIST_HITTEST flags) and also the subItem, if
any.
"""
return _controls_.ListCtrl_HitTestSubItem(*args, **kwargs)
def InsertItem(*args, **kwargs):
"""InsertItem(self, ListItem info) -> long"""
return _controls_.ListCtrl_InsertItem(*args, **kwargs)
@@ -5380,6 +5392,10 @@ class GenericDirCtrl(_core.Control):
"""ExpandPath(self, String path) -> bool"""
return _controls_.GenericDirCtrl_ExpandPath(*args, **kwargs)
def CollapsePath(*args, **kwargs):
"""CollapsePath(self, String path) -> bool"""
return _controls_.GenericDirCtrl_CollapsePath(*args, **kwargs)
def GetDefaultPath(*args, **kwargs):
"""GetDefaultPath(self) -> String"""
return _controls_.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
@@ -5708,8 +5724,14 @@ class HelpEvent(_core.CommandEvent):
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
Origin_Unknown = _controls_.HelpEvent_Origin_Unknown
Origin_Keyboard = _controls_.HelpEvent_Origin_Keyboard
Origin_HelpButton = _controls_.HelpEvent_Origin_HelpButton
def __init__(self, *args, **kwargs):
"""__init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""
"""
__init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition,
int origin=Origin_Unknown) -> HelpEvent
"""
_controls_.HelpEvent_swiginit(self,_controls_.new_HelpEvent(*args, **kwargs))
def GetPosition(*args, **kwargs):
"""
@@ -5761,6 +5783,18 @@ class HelpEvent(_core.CommandEvent):
"""
return _controls_.HelpEvent_SetTarget(*args, **kwargs)
def GetOrigin(*args, **kwargs):
"""
GetOrigin(self) -> int
Optiononal indication of the source of the event.
"""
return _controls_.HelpEvent_GetOrigin(*args, **kwargs)
def SetOrigin(*args, **kwargs):
"""SetOrigin(self, int origin)"""
return _controls_.HelpEvent_SetOrigin(*args, **kwargs)
_controls_.HelpEvent_swigregister(HelpEvent)
class ContextHelp(_core.Object):
@@ -6173,5 +6207,130 @@ def PreDatePickerCtrl(*args, **kwargs):
val = _controls_.new_PreDatePickerCtrl(*args, **kwargs)
return val
HL_CONTEXTMENU = _controls_.HL_CONTEXTMENU
HL_DEFAULT_STYLE = _controls_.HL_DEFAULT_STYLE
#---------------------------------------------------------------------------
class HyperlinkCtrl(_core.Control):
"""
A static text control that emulates a hyperlink. The link is displayed
in an appropriate text style, derived from the control's normal font.
When the mouse rolls over the link, the cursor changes to a hand and
the link's color changes to the active color.
Clicking on the link does not launch a web browser; instead, a
wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
events.
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, Window parent, int id, String label, String url, Point pos=DefaultPosition,
Size size=DefaultSize,
long style=HL_DEFAULT_STYLE, String name=HyperlinkCtrlNameStr) -> HyperlinkCtrl
A static text control that emulates a hyperlink. The link is displayed
in an appropriate text style, derived from the control's normal font.
When the mouse rolls over the link, the cursor changes to a hand and
the link's color changes to the active color.
Clicking on the link does not launch a web browser; instead, a
wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
events.
"""
_controls_.HyperlinkCtrl_swiginit(self,_controls_.new_HyperlinkCtrl(*args, **kwargs))
self._setOORInfo(self)
def Create(*args, **kwargs):
"""
Create(self, Window parent, int id, String label, String url, Point pos=DefaultPosition,
Size size=DefaultSize,
long style=HL_DEFAULT_STYLE, String name=HyperlinkCtrlNameStr) -> bool
"""
return _controls_.HyperlinkCtrl_Create(*args, **kwargs)
def GetHoverColour(*args, **kwargs):
"""GetHoverColour(self) -> Colour"""
return _controls_.HyperlinkCtrl_GetHoverColour(*args, **kwargs)
def SetHoverColour(*args, **kwargs):
"""SetHoverColour(self, Colour colour)"""
return _controls_.HyperlinkCtrl_SetHoverColour(*args, **kwargs)
def GetNormalColour(*args, **kwargs):
"""GetNormalColour(self) -> Colour"""
return _controls_.HyperlinkCtrl_GetNormalColour(*args, **kwargs)
def SetNormalColour(*args, **kwargs):
"""SetNormalColour(self, Colour colour)"""
return _controls_.HyperlinkCtrl_SetNormalColour(*args, **kwargs)
def GetVisitedColour(*args, **kwargs):
"""GetVisitedColour(self) -> Colour"""
return _controls_.HyperlinkCtrl_GetVisitedColour(*args, **kwargs)
def SetVisitedColour(*args, **kwargs):
"""SetVisitedColour(self, Colour colour)"""
return _controls_.HyperlinkCtrl_SetVisitedColour(*args, **kwargs)
def GetURL(*args, **kwargs):
"""GetURL(self) -> String"""
return _controls_.HyperlinkCtrl_GetURL(*args, **kwargs)
def SetURL(*args, **kwargs):
"""SetURL(self, String url)"""
return _controls_.HyperlinkCtrl_SetURL(*args, **kwargs)
def SetVisited(*args, **kwargs):
"""SetVisited(self, bool visited=True)"""
return _controls_.HyperlinkCtrl_SetVisited(*args, **kwargs)
def GetVisited(*args, **kwargs):
"""GetVisited(self) -> bool"""
return _controls_.HyperlinkCtrl_GetVisited(*args, **kwargs)
_controls_.HyperlinkCtrl_swigregister(HyperlinkCtrl)
HyperlinkCtrlNameStr = cvar.HyperlinkCtrlNameStr
def PreHyperlinkCtrl(*args, **kwargs):
"""
PreHyperlinkCtrl() -> HyperlinkCtrl
A static text control that emulates a hyperlink. The link is displayed
in an appropriate text style, derived from the control's normal font.
When the mouse rolls over the link, the cursor changes to a hand and
the link's color changes to the active color.
Clicking on the link does not launch a web browser; instead, a
wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
events.
"""
val = _controls_.new_PreHyperlinkCtrl(*args, **kwargs)
return val
wxEVT_COMMAND_HYPERLINK = _controls_.wxEVT_COMMAND_HYPERLINK
class HyperlinkEvent(_core.CommandEvent):
"""Proxy of C++ HyperlinkEvent class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, Object generator, int id, String url) -> HyperlinkEvent"""
_controls_.HyperlinkEvent_swiginit(self,_controls_.new_HyperlinkEvent(*args, **kwargs))
def GetURL(*args, **kwargs):
"""GetURL(self) -> String"""
return _controls_.HyperlinkEvent_GetURL(*args, **kwargs)
def SetURL(*args, **kwargs):
"""SetURL(self, String url)"""
return _controls_.HyperlinkEvent_SetURL(*args, **kwargs)
_controls_.HyperlinkEvent_swigregister(HyperlinkEvent)
EVT_HYPERLINK = wx.PyEventBinder( wxEVT_COMMAND_HYPERLINK, 1 )
wxPython/src/msw/_controls_wrap.cpp
+1201 -161
View File
File diff suppressed because one or more lines are too long
wxPython/src/msw/_core.py
+28 -31
View File
@@ -271,13 +271,6 @@ ID_ZOOM_OUT = _core_.ID_ZOOM_OUT
ID_UNDELETE = _core_.ID_UNDELETE
ID_REVERT_TO_SAVED = _core_.ID_REVERT_TO_SAVED
ID_HIGHEST = _core_.ID_HIGHEST
OPEN = _core_.OPEN
SAVE = _core_.SAVE
HIDE_READONLY = _core_.HIDE_READONLY
OVERWRITE_PROMPT = _core_.OVERWRITE_PROMPT
FILE_MUST_EXIST = _core_.FILE_MUST_EXIST
MULTIPLE = _core_.MULTIPLE
CHANGE_DIR = _core_.CHANGE_DIR
ACCEL_ALT = _core_.ACCEL_ALT
ACCEL_CTRL = _core_.ACCEL_CTRL
ACCEL_SHIFT = _core_.ACCEL_SHIFT
@@ -290,9 +283,6 @@ PD_ESTIMATED_TIME = _core_.PD_ESTIMATED_TIME
PD_REMAINING_TIME = _core_.PD_REMAINING_TIME
PD_SMOOTH = _core_.PD_SMOOTH
PD_CAN_SKIP = _core_.PD_CAN_SKIP
DD_NEW_DIR_BUTTON = _core_.DD_NEW_DIR_BUTTON
DD_DEFAULT_STYLE = _core_.DD_DEFAULT_STYLE
DD_CHANGE_DIR = _core_.DD_CHANGE_DIR
MENU_TEAROFF = _core_.MENU_TEAROFF
MB_DOCKABLE = _core_.MB_DOCKABLE
NO_FULL_REPAINT_ON_RESIZE = _core_.NO_FULL_REPAINT_ON_RESIZE
@@ -3501,7 +3491,6 @@ wxEVT_CLOSE_WINDOW = _core_.wxEVT_CLOSE_WINDOW
wxEVT_END_SESSION = _core_.wxEVT_END_SESSION
wxEVT_QUERY_END_SESSION = _core_.wxEVT_QUERY_END_SESSION
wxEVT_ACTIVATE_APP = _core_.wxEVT_ACTIVATE_APP
wxEVT_POWER = _core_.wxEVT_POWER
wxEVT_ACTIVATE = _core_.wxEVT_ACTIVATE
wxEVT_CREATE = _core_.wxEVT_CREATE
wxEVT_DESTROY = _core_.wxEVT_DESTROY
@@ -3557,7 +3546,7 @@ EVT_ERASE_BACKGROUND = wx.PyEventBinder( wxEVT_ERASE_BACKGROUND )
EVT_CHAR = wx.PyEventBinder( wxEVT_CHAR )
EVT_KEY_DOWN = wx.PyEventBinder( wxEVT_KEY_DOWN )
EVT_KEY_UP = wx.PyEventBinder( wxEVT_KEY_UP )
EVT_HOTKEY = wx.PyEventBinder( wxEVT_HOTKEY, 1)
EVT_HOTKEY = wx.PyEventBinder( wxEVT_HOTKEY, 1)
EVT_CHAR_HOOK = wx.PyEventBinder( wxEVT_CHAR_HOOK )
EVT_MENU_OPEN = wx.PyEventBinder( wxEVT_MENU_OPEN )
EVT_MENU_CLOSE = wx.PyEventBinder( wxEVT_MENU_CLOSE )
@@ -3568,7 +3557,7 @@ EVT_KILL_FOCUS = wx.PyEventBinder( wxEVT_KILL_FOCUS )
EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )
EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )
EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )
EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )
@@ -3617,11 +3606,11 @@ EVT_MOUSE_EVENTS = wx.PyEventBinder([ wxEVT_LEFT_DOWN,
# Scrolling from wxWindow (sent to wxScrolledWindow)
EVT_SCROLLWIN = wx.PyEventBinder([ wxEVT_SCROLLWIN_TOP,
EVT_SCROLLWIN = wx.PyEventBinder([ wxEVT_SCROLLWIN_TOP,
wxEVT_SCROLLWIN_BOTTOM,
wxEVT_SCROLLWIN_LINEUP,
wxEVT_SCROLLWIN_LINEDOWN,
wxEVT_SCROLLWIN_PAGEUP,
wxEVT_SCROLLWIN_PAGEUP,
wxEVT_SCROLLWIN_PAGEDOWN,
wxEVT_SCROLLWIN_THUMBTRACK,
wxEVT_SCROLLWIN_THUMBRELEASE,
@@ -3637,14 +3626,14 @@ EVT_SCROLLWIN_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBTRACK )
EVT_SCROLLWIN_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBRELEASE )
# Scrolling from wx.Slider and wx.ScrollBar
EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
wxEVT_SCROLL_THUMBRELEASE,
EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
wxEVT_SCROLL_THUMBRELEASE,
wxEVT_SCROLL_CHANGED,
])
@@ -3658,15 +3647,15 @@ EVT_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK )
EVT_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE )
EVT_SCROLL_CHANGED = wx.PyEventBinder( wxEVT_SCROLL_CHANGED )
EVT_SCROLL_ENDSCROLL = EVT_SCROLL_CHANGED
# Scrolling from wx.Slider and wx.ScrollBar, with an id
EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
wxEVT_SCROLL_BOTTOM,
wxEVT_SCROLL_LINEUP,
wxEVT_SCROLL_LINEDOWN,
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
wxEVT_SCROLL_THUMBRELEASE,
wxEVT_SCROLL_CHANGED,
], 1)
@@ -8403,6 +8392,14 @@ class Window(EvtHandler):
"""
return _core_.Window_RemoveChild(*args, **kwargs)
def SetDoubleBuffered(*args, **kwargs):
"""
SetDoubleBuffered(self, bool on)
Currently wxGTK2 only.
"""
return _core_.Window_SetDoubleBuffered(*args, **kwargs)
def FindWindowById(*args, **kwargs):
"""
FindWindowById(self, long winid) -> Window
wxPython/src/msw/_core_wrap.cpp
+40 -11
View File
@@ -3790,6 +3790,7 @@ SWIGINTERN PyObject *wxWindow_GetChildren(wxWindow *self){
wxWindowList& list = self->GetChildren();
return wxPy_ConvertList(&list);
}
SWIGINTERN void wxWindow_SetDoubleBuffered(wxWindow *self,bool on){}
SWIGINTERN bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keycode){
#if wxUSE_HOTKEY
return self->RegisterHotKey(hotkeyId, modifiers, keycode);
@@ -33181,6 +33182,44 @@ fail:
}
SWIGINTERN PyObject *_wrap_Window_SetDoubleBuffered(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
bool arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
bool val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "on", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDoubleBuffered",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_SetDoubleBuffered" "', expected argument " "1"" of type '" "wxWindow *""'");
}
arg1 = reinterpret_cast< wxWindow * >(argp1);
ecode2 = SWIG_AsVal_bool(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Window_SetDoubleBuffered" "', expected argument " "2"" of type '" "bool""'");
}
arg2 = static_cast< bool >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxWindow_SetDoubleBuffered(arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Window_FindWindowById(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxWindow *arg1 = (wxWindow *) 0 ;
@@ -53486,6 +53525,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Window_Reparent", (PyCFunction) _wrap_Window_Reparent, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_AddChild", (PyCFunction) _wrap_Window_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_RemoveChild", (PyCFunction) _wrap_Window_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_SetDoubleBuffered", (PyCFunction) _wrap_Window_SetDoubleBuffered, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_FindWindowById", (PyCFunction) _wrap_Window_FindWindowById, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_FindWindowByName", (PyCFunction) _wrap_Window_FindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Window_GetEventHandler", (PyCFunction)_wrap_Window_GetEventHandler, METH_O, NULL},
@@ -55754,13 +55794,6 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "ID_UNDELETE",SWIG_From_int(static_cast< int >(wxID_UNDELETE)));
SWIG_Python_SetConstant(d, "ID_REVERT_TO_SAVED",SWIG_From_int(static_cast< int >(wxID_REVERT_TO_SAVED)));
SWIG_Python_SetConstant(d, "ID_HIGHEST",SWIG_From_int(static_cast< int >(wxID_HIGHEST)));
SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
SWIG_Python_SetConstant(d, "HIDE_READONLY",SWIG_From_int(static_cast< int >(wxHIDE_READONLY)));
SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST)));
SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE)));
SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR)));
SWIG_Python_SetConstant(d, "ACCEL_ALT",SWIG_From_int(static_cast< int >(wxACCEL_ALT)));
SWIG_Python_SetConstant(d, "ACCEL_CTRL",SWIG_From_int(static_cast< int >(wxACCEL_CTRL)));
SWIG_Python_SetConstant(d, "ACCEL_SHIFT",SWIG_From_int(static_cast< int >(wxACCEL_SHIFT)));
@@ -55773,9 +55806,6 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "PD_REMAINING_TIME",SWIG_From_int(static_cast< int >(wxPD_REMAINING_TIME)));
SWIG_Python_SetConstant(d, "PD_SMOOTH",SWIG_From_int(static_cast< int >(wxPD_SMOOTH)));
SWIG_Python_SetConstant(d, "PD_CAN_SKIP",SWIG_From_int(static_cast< int >(wxPD_CAN_SKIP)));
SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "MENU_TEAROFF",SWIG_From_int(static_cast< int >(wxMENU_TEAROFF)));
SWIG_Python_SetConstant(d, "MB_DOCKABLE",SWIG_From_int(static_cast< int >(wxMB_DOCKABLE)));
SWIG_Python_SetConstant(d, "NO_FULL_REPAINT_ON_RESIZE",SWIG_From_int(static_cast< int >(wxNO_FULL_REPAINT_ON_RESIZE)));
@@ -56355,7 +56385,6 @@ SWIGEXPORT void SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_END_SESSION", PyInt_FromLong(wxEVT_END_SESSION));
PyDict_SetItemString(d, "wxEVT_QUERY_END_SESSION", PyInt_FromLong(wxEVT_QUERY_END_SESSION));
PyDict_SetItemString(d, "wxEVT_ACTIVATE_APP", PyInt_FromLong(wxEVT_ACTIVATE_APP));
PyDict_SetItemString(d, "wxEVT_POWER", PyInt_FromLong(wxEVT_POWER));
PyDict_SetItemString(d, "wxEVT_ACTIVATE", PyInt_FromLong(wxEVT_ACTIVATE));
PyDict_SetItemString(d, "wxEVT_CREATE", PyInt_FromLong(wxEVT_CREATE));
PyDict_SetItemString(d, "wxEVT_DESTROY", PyInt_FromLong(wxEVT_DESTROY));
wxPython/src/msw/_gdi.py
+127 -63
View File
@@ -1376,7 +1376,7 @@ class NativeFontInfo(object):
return _gdi_.NativeFontInfo_SetUnderlined(*args, **kwargs)
def SetFaceName(*args, **kwargs):
"""SetFaceName(self, String facename)"""
"""SetFaceName(self, String facename) -> bool"""
return _gdi_.NativeFontInfo_SetFaceName(*args, **kwargs)
def SetFamily(*args, **kwargs):
@@ -1767,7 +1767,7 @@ class Font(GDIObject):
def SetFaceName(*args, **kwargs):
"""
SetFaceName(self, String faceName)
SetFaceName(self, String faceName) -> bool
Sets the facename for the font. The facename, which should be a valid
font installed on the end-user's system.
@@ -1806,7 +1806,7 @@ class Font(GDIObject):
def SetNativeFontInfoFromString(*args, **kwargs):
"""
SetNativeFontInfoFromString(self, String info)
SetNativeFontInfoFromString(self, String info) -> bool
Set the font's attributes from string representation of a
`wx.NativeFontInfo` object.
@@ -1815,7 +1815,7 @@ class Font(GDIObject):
def SetNativeFontInfoUserDesc(*args, **kwargs):
"""
SetNativeFontInfoUserDesc(self, String info)
SetNativeFontInfoUserDesc(self, String info) -> bool
Set the font's attributes from a string formerly returned from
`GetNativeFontInfoDesc`.
@@ -1998,15 +1998,44 @@ class FontEnumerator(object):
return _gdi_.FontEnumerator_EnumerateEncodings(*args, **kwargs)
def GetEncodings(*args, **kwargs):
"""GetEncodings(self) -> PyObject"""
"""GetEncodings() -> PyObject"""
return _gdi_.FontEnumerator_GetEncodings(*args, **kwargs)
GetEncodings = staticmethod(GetEncodings)
def GetFacenames(*args, **kwargs):
"""GetFacenames(self) -> PyObject"""
"""GetFacenames() -> PyObject"""
return _gdi_.FontEnumerator_GetFacenames(*args, **kwargs)
GetFacenames = staticmethod(GetFacenames)
def IsValidFacename(*args, **kwargs):
"""
IsValidFacename(String str) -> bool
Convenience function that returns true if the given face name exist in
the user's system
"""
return _gdi_.FontEnumerator_IsValidFacename(*args, **kwargs)
IsValidFacename = staticmethod(IsValidFacename)
_gdi_.FontEnumerator_swigregister(FontEnumerator)
def FontEnumerator_GetEncodings(*args):
"""FontEnumerator_GetEncodings() -> PyObject"""
return _gdi_.FontEnumerator_GetEncodings(*args)
def FontEnumerator_GetFacenames(*args):
"""FontEnumerator_GetFacenames() -> PyObject"""
return _gdi_.FontEnumerator_GetFacenames(*args)
def FontEnumerator_IsValidFacename(*args, **kwargs):
"""
FontEnumerator_IsValidFacename(String str) -> bool
Convenience function that returns true if the given face name exist in
the user's system
"""
return _gdi_.FontEnumerator_IsValidFacename(*args, **kwargs)
#---------------------------------------------------------------------------
LANGUAGE_DEFAULT = _gdi_.LANGUAGE_DEFAULT
@@ -4519,44 +4548,50 @@ class StockGDI(object):
def _initStockObjects():
import wx
wx.ITALIC_FONT = StockGDI.instance().GetFont(StockGDI.FONT_ITALIC)
wx.NORMAL_FONT = StockGDI.instance().GetFont(StockGDI.FONT_NORMAL)
wx.SMALL_FONT = StockGDI.instance().GetFont(StockGDI.FONT_SMALL)
wx.SWISS_FONT = StockGDI.instance().GetFont(StockGDI.FONT_SWISS)
wx.ITALIC_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_ITALIC).this
wx.NORMAL_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_NORMAL).this
wx.SMALL_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_SMALL).this
wx.SWISS_FONT.this = StockGDI.instance().GetFont(StockGDI.FONT_SWISS).this
wx.BLACK_DASHED_PEN = StockGDI.GetPen(StockGDI.PEN_BLACKDASHED)
wx.BLACK_PEN = StockGDI.GetPen(StockGDI.PEN_BLACK)
wx.CYAN_PEN = StockGDI.GetPen(StockGDI.PEN_CYAN)
wx.GREEN_PEN = StockGDI.GetPen(StockGDI.PEN_GREEN)
wx.GREY_PEN = StockGDI.GetPen(StockGDI.PEN_GREY)
wx.LIGHT_GREY_PEN = StockGDI.GetPen(StockGDI.PEN_LIGHTGREY)
wx.MEDIUM_GREY_PEN = StockGDI.GetPen(StockGDI.PEN_MEDIUMGREY)
wx.RED_PEN = StockGDI.GetPen(StockGDI.PEN_RED)
wx.TRANSPARENT_PEN = StockGDI.GetPen(StockGDI.PEN_TRANSPARENT)
wx.WHITE_PEN = StockGDI.GetPen(StockGDI.PEN_WHITE)
wx.BLACK_DASHED_PEN.this = StockGDI.GetPen(StockGDI.PEN_BLACKDASHED).this
wx.BLACK_PEN.this = StockGDI.GetPen(StockGDI.PEN_BLACK).this
wx.CYAN_PEN.this = StockGDI.GetPen(StockGDI.PEN_CYAN).this
wx.GREEN_PEN.this = StockGDI.GetPen(StockGDI.PEN_GREEN).this
wx.GREY_PEN.this = StockGDI.GetPen(StockGDI.PEN_GREY).this
wx.LIGHT_GREY_PEN.this = StockGDI.GetPen(StockGDI.PEN_LIGHTGREY).this
wx.MEDIUM_GREY_PEN.this = StockGDI.GetPen(StockGDI.PEN_MEDIUMGREY).this
wx.RED_PEN.this = StockGDI.GetPen(StockGDI.PEN_RED).this
wx.TRANSPARENT_PEN.this = StockGDI.GetPen(StockGDI.PEN_TRANSPARENT).this
wx.WHITE_PEN.this = StockGDI.GetPen(StockGDI.PEN_WHITE).this
wx.BLACK_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_BLACK)
wx.BLUE_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_BLUE)
wx.CYAN_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_CYAN)
wx.GREEN_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_GREEN)
wx.GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_GREY)
wx.LIGHT_GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_LIGHTGREY)
wx.MEDIUM_GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_MEDIUMGREY)
wx.RED_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_RED)
wx.TRANSPARENT_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_TRANSPARENT)
wx.WHITE_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_WHITE)
wx.BLACK_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_BLACK).this
wx.BLUE_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_BLUE).this
wx.CYAN_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_CYAN).this
wx.GREEN_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_GREEN).this
wx.GREY_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_GREY).this
wx.LIGHT_GREY_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_LIGHTGREY).this
wx.MEDIUM_GREY_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_MEDIUMGREY).this
wx.RED_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_RED).this
wx.TRANSPARENT_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_TRANSPARENT).this
wx.WHITE_BRUSH.this = StockGDI.GetBrush(StockGDI.BRUSH_WHITE).this
wx.BLACK = StockGDI.GetColour(StockGDI.COLOUR_BLACK)
wx.BLUE = StockGDI.GetColour(StockGDI.COLOUR_BLUE)
wx.CYAN = StockGDI.GetColour(StockGDI.COLOUR_CYAN)
wx.GREEN = StockGDI.GetColour(StockGDI.COLOUR_GREEN)
wx.LIGHT_GREY = StockGDI.GetColour(StockGDI.COLOUR_LIGHTGREY)
wx.RED = StockGDI.GetColour(StockGDI.COLOUR_RED)
wx.WHITE = StockGDI.GetColour(StockGDI.COLOUR_WHITE)
wx.BLACK.this = StockGDI.GetColour(StockGDI.COLOUR_BLACK).this
wx.BLUE.this = StockGDI.GetColour(StockGDI.COLOUR_BLUE).this
wx.CYAN.this = StockGDI.GetColour(StockGDI.COLOUR_CYAN).this
wx.GREEN.this = StockGDI.GetColour(StockGDI.COLOUR_GREEN).this
wx.LIGHT_GREY.this = StockGDI.GetColour(StockGDI.COLOUR_LIGHTGREY).this
wx.RED.this = StockGDI.GetColour(StockGDI.COLOUR_RED).this
wx.WHITE.this = StockGDI.GetColour(StockGDI.COLOUR_WHITE).this
wx.CROSS_CURSOR.this = StockGDI.GetCursor(StockGDI.CURSOR_CROSS).this
wx.HOURGLASS_CURSOR.this = StockGDI.GetCursor(StockGDI.CURSOR_HOURGLASS).this
wx.STANDARD_CURSOR.this = StockGDI.GetCursor(StockGDI.CURSOR_STANDARD).this
wx.TheFontList.this = _wxPyInitTheFontList().this
wx.ThePenList.this = _wxPyInitThePenList().this
wx.TheBrushList.this = _wxPyInitTheBrushList().this
wx.TheColourDatabase.this = _wxPyInitTheColourDatabase().this
wx.CROSS_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_CROSS)
wx.HOURGLASS_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_HOURGLASS)
wx.STANDARD_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_STANDARD)
_initStockObjects = staticmethod(_initStockObjects)
@@ -4586,6 +4621,47 @@ def StockGDI_GetPen(*args, **kwargs):
"""StockGDI_GetPen(int item) -> Pen"""
return _gdi_.StockGDI_GetPen(*args, **kwargs)
# Create an uninitialized instance for the stock objects, they will
# be initialized later when the wx.App object is created.
ITALIC_FONT = Font.__new__(Font)
NORMAL_FONT = Font.__new__(Font)
SMALL_FONT = Font.__new__(Font)
SWISS_FONT = Font.__new__(Font)
BLACK_DASHED_PEN = Pen.__new__(Pen)
BLACK_PEN = Pen.__new__(Pen)
CYAN_PEN = Pen.__new__(Pen)
GREEN_PEN = Pen.__new__(Pen)
GREY_PEN = Pen.__new__(Pen)
LIGHT_GREY_PEN = Pen.__new__(Pen)
MEDIUM_GREY_PEN = Pen.__new__(Pen)
RED_PEN = Pen.__new__(Pen)
TRANSPARENT_PEN = Pen.__new__(Pen)
WHITE_PEN = Pen.__new__(Pen)
BLACK_BRUSH = Brush.__new__(Brush)
BLUE_BRUSH = Brush.__new__(Brush)
CYAN_BRUSH = Brush.__new__(Brush)
GREEN_BRUSH = Brush.__new__(Brush)
GREY_BRUSH = Brush.__new__(Brush)
LIGHT_GREY_BRUSH = Brush.__new__(Brush)
MEDIUM_GREY_BRUSH = Brush.__new__(Brush)
RED_BRUSH = Brush.__new__(Brush)
TRANSPARENT_BRUSH = Brush.__new__(Brush)
WHITE_BRUSH = Brush.__new__(Brush)
BLACK = Colour.__new__(Colour)
BLUE = Colour.__new__(Colour)
CYAN = Colour.__new__(Colour)
GREEN = Colour.__new__(Colour)
LIGHT_GREY = Colour.__new__(Colour)
RED = Colour.__new__(Colour)
WHITE = Colour.__new__(Colour)
CROSS_CURSOR = Cursor.__new__(Cursor)
HOURGLASS_CURSOR = Cursor.__new__(Cursor)
STANDARD_CURSOR = Cursor.__new__(Cursor)
class GDIObjListBase(object):
"""Proxy of C++ GDIObjListBase class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -4722,29 +4798,12 @@ def _wxPyInitTheBrushList(*args):
def _wxPyInitTheColourDatabase(*args):
"""_wxPyInitTheColourDatabase() -> ColourDatabase"""
return _gdi_._wxPyInitTheColourDatabase(*args)
# This function makes a class used to do delayed initialization of some
# stock wx objects. When they are used the first time then an init function
# is called to make the real instance, which is then used to replace the
# original instance and class seen by the programmer.
def _wxPyMakeDelayedInitWrapper(initFunc):
class _wxPyStockObjectWrapper(object):
def __init__(self, *args):
self._args = args
def __getattr__(self, name):
obj = initFunc(*self._args)
self.__class__ = obj.__class__
self.__dict__ = obj.__dict__
return getattr(self, name)
def __str__(self):
return self.__getattr__("__str__")()
def __repr__(self):
return self.__getattr__("__repr__")()
return _wxPyStockObjectWrapper
TheFontList = _wxPyMakeDelayedInitWrapper(_wxPyInitTheFontList)()
ThePenList = _wxPyMakeDelayedInitWrapper(_wxPyInitThePenList)()
TheBrushList = _wxPyMakeDelayedInitWrapper(_wxPyInitTheBrushList)()
TheColourDatabase = _wxPyMakeDelayedInitWrapper(_wxPyInitTheColourDatabase)()
# Create an uninitialized instance for the stock objects, they will
# be initialized later when the wx.App object is created.
TheFontList = FontList.__new__(FontList)
ThePenList = PenList.__new__(PenList)
TheBrushList = BrushList.__new__(BrushList)
TheColourDatabase = ColourDatabase.__new__(ColourDatabase)
NullColor = NullColour
#---------------------------------------------------------------------------
@@ -4913,6 +4972,11 @@ class RendererNative(object):
genereic controls in ways that are as close to the native look as
possible.
Note that each drawing function restores the `wx.DC` attributes if it
changes them, so it is safe to assume that the same pen, brush and
colours that were active before the call to this function are still in
effect after it.
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
wxPython/src/msw/_gdi_wrap.cpp
+76 -46
View File
@@ -3077,25 +3077,19 @@ IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFacename);
IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);
SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){
SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(){
PyObject* ret;
wxArrayString* arr = self->GetEncodings();
wxArrayString arr = wxFontEnumerator::GetEncodings();
wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (arr)
ret = wxArrayString2PyList_helper(*arr);
else
ret = PyList_New(0);
ret = wxArrayString2PyList_helper(arr);
wxPyEndBlockThreads(blocked);
return ret;
}
SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(){
PyObject* ret;
wxArrayString* arr = self->GetFacenames();
wxArrayString arr = wxFontEnumerator::GetFacenames();
wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (arr)
ret = wxArrayString2PyList_helper(*arr);
else
ret = PyList_New(0);
ret = wxArrayString2PyList_helper(arr);
wxPyEndBlockThreads(blocked);
return ret;
}
@@ -10511,6 +10505,7 @@ SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *SWIGUNUSEDPARM(s
PyObject *resultobj = 0;
wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
wxString arg2 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject * obj0 = 0 ;
@@ -10533,11 +10528,13 @@ SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *SWIGUNUSEDPARM(s
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetFaceName(arg2);
result = (bool)(arg1)->SetFaceName(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
@@ -12900,6 +12897,7 @@ SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyOb
PyObject *resultobj = 0;
wxFont *arg1 = (wxFont *) 0 ;
wxString *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
bool temp2 = false ;
@@ -12922,11 +12920,13 @@ SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyOb
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetFaceName((wxString const &)*arg2);
result = (bool)(arg1)->SetFaceName((wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp2)
delete arg2;
@@ -13062,6 +13062,7 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *SWIGUNUSED
PyObject *resultobj = 0;
wxFont *arg1 = (wxFont *) 0 ;
wxString *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
bool temp2 = false ;
@@ -13084,11 +13085,13 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *SWIGUNUSED
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetNativeFontInfo((wxString const &)*arg2);
result = (bool)(arg1)->SetNativeFontInfo((wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp2)
delete arg2;
@@ -13107,6 +13110,7 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPA
PyObject *resultobj = 0;
wxFont *arg1 = (wxFont *) 0 ;
wxString *arg2 = 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
bool temp2 = false ;
@@ -13129,11 +13133,13 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPA
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetNativeFontInfoUserDesc((wxString const &)*arg2);
result = (bool)(arg1)->SetNativeFontInfoUserDesc((wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp2)
delete arg2;
@@ -13578,22 +13584,12 @@ fail:
SWIGINTERN PyObject *_wrap_FontEnumerator_GetEncodings(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
PyObject *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_GetEncodings" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'");
}
arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetEncodings",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (PyObject *)wxPyFontEnumerator_GetEncodings(arg1);
result = (PyObject *)wxPyFontEnumerator_GetEncodings();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -13606,22 +13602,12 @@ fail:
SWIGINTERN PyObject *_wrap_FontEnumerator_GetFacenames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
PyObject *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_GetFacenames" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'");
}
arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetFacenames",0,0,0)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (PyObject *)wxPyFontEnumerator_GetFacenames(arg1);
result = (PyObject *)wxPyFontEnumerator_GetFacenames();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -13632,6 +13618,45 @@ fail:
}
SWIGINTERN PyObject *_wrap_FontEnumerator_IsValidFacename(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxString *arg1 = 0 ;
bool result;
bool temp1 = false ;
PyObject * obj0 = 0 ;
char * kwnames[] = {
(char *) "str", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontEnumerator_IsValidFacename",kwnames,&obj0)) SWIG_fail;
{
arg1 = wxString_in_helper(obj0);
if (arg1 == NULL) SWIG_fail;
temp1 = true;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)wxPyFontEnumerator::IsValidFacename((wxString const &)*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
{
if (temp1)
delete arg1;
}
return resultobj;
fail:
{
if (temp1)
delete arg1;
}
return NULL;
}
SWIGINTERN PyObject *FontEnumerator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *obj;
if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -25670,6 +25695,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_Get(PyObject *SWIGUNUSEDPARM(self), Py
if (!SWIG_Python_UnpackTuple(args,"RendererNative_Get",0,0,0)) SWIG_fail;
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRendererNative &_result_ref = wxRendererNative::Get();
@@ -25691,6 +25717,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_GetGeneric(PyObject *SWIGUNUSEDPARM(se
if (!SWIG_Python_UnpackTuple(args,"RendererNative_GetGeneric",0,0,0)) SWIG_fail;
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRendererNative &_result_ref = wxRendererNative::GetGeneric();
@@ -25712,6 +25739,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_GetDefault(PyObject *SWIGUNUSEDPARM(se
if (!SWIG_Python_UnpackTuple(args,"RendererNative_GetDefault",0,0,0)) SWIG_fail;
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRendererNative &_result_ref = wxRendererNative::GetDefault();
@@ -25745,6 +25773,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_Set(PyObject *SWIGUNUSEDPARM(self), Py
}
arg1 = reinterpret_cast< wxRendererNative * >(argp1);
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxRendererNative *)wxRendererNative::Set(arg1);
wxPyEndAllowThreads(__tstate);
@@ -26102,8 +26131,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FontEnumerator__setCallbackInfo", (PyCFunction) _wrap_FontEnumerator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_EnumerateFacenames", (PyCFunction) _wrap_FontEnumerator_EnumerateFacenames, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_EnumerateEncodings", (PyCFunction) _wrap_FontEnumerator_EnumerateEncodings, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_GetEncodings", (PyCFunction)_wrap_FontEnumerator_GetEncodings, METH_O, NULL},
{ (char *)"FontEnumerator_GetFacenames", (PyCFunction)_wrap_FontEnumerator_GetFacenames, METH_O, NULL},
{ (char *)"FontEnumerator_GetEncodings", (PyCFunction)_wrap_FontEnumerator_GetEncodings, METH_NOARGS, NULL},
{ (char *)"FontEnumerator_GetFacenames", (PyCFunction)_wrap_FontEnumerator_GetFacenames, METH_NOARGS, NULL},
{ (char *)"FontEnumerator_IsValidFacename", (PyCFunction) _wrap_FontEnumerator_IsValidFacename, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FontEnumerator_swigregister", FontEnumerator_swigregister, METH_VARARGS, NULL},
{ (char *)"FontEnumerator_swiginit", FontEnumerator_swiginit, METH_VARARGS, NULL},
{ (char *)"LanguageInfo_Language_set", _wrap_LanguageInfo_Language_set, METH_VARARGS, NULL},
wxPython/src/msw/_misc.py
+61 -1
View File
@@ -432,7 +432,7 @@ def SaveFileSelector(*args, **kwargs):
def DirSelector(*args, **kwargs):
"""
DirSelector(String message=DirSelectorPromptStr, String defaultPath=EmptyString,
long style=DD_DEFAULT_STYLE,
long style=wxDD_DEFAULT_STYLE,
Point pos=DefaultPosition, Window parent=None) -> String
"""
return _misc_.DirSelector(*args, **kwargs)
@@ -5776,5 +5776,65 @@ def StandardPaths_Get(*args):
"""
return _misc_.StandardPaths_Get(*args)
#---------------------------------------------------------------------------
POWER_SOCKET = _misc_.POWER_SOCKET
POWER_BATTERY = _misc_.POWER_BATTERY
POWER_UNKNOWN = _misc_.POWER_UNKNOWN
BATTERY_NORMAL_STATE = _misc_.BATTERY_NORMAL_STATE
BATTERY_LOW_STATE = _misc_.BATTERY_LOW_STATE
BATTERY_CRITICAL_STATE = _misc_.BATTERY_CRITICAL_STATE
BATTERY_SHUTDOWN_STATE = _misc_.BATTERY_SHUTDOWN_STATE
BATTERY_UNKNOWN_STATE = _misc_.BATTERY_UNKNOWN_STATE
class PowerEvent(_core.Event):
"""
wx.PowerEvent is generated when the system online status changes.
Currently this is only implemented for Windows.
"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, EventType evtType) -> PowerEvent
wx.PowerEvent is generated when the system online status changes.
Currently this is only implemented for Windows.
"""
_misc_.PowerEvent_swiginit(self,_misc_.new_PowerEvent(*args, **kwargs))
def Veto(*args, **kwargs):
"""Veto(self)"""
return _misc_.PowerEvent_Veto(*args, **kwargs)
def IsVetoed(*args, **kwargs):
"""IsVetoed(self) -> bool"""
return _misc_.PowerEvent_IsVetoed(*args, **kwargs)
_misc_.PowerEvent_swigregister(PowerEvent)
wxEVT_POWER_SUSPENDING = _misc_.wxEVT_POWER_SUSPENDING
wxEVT_POWER_SUSPENDED = _misc_.wxEVT_POWER_SUSPENDED
wxEVT_POWER_SUSPEND_CANCEL = _misc_.wxEVT_POWER_SUSPEND_CANCEL
wxEVT_POWER_RESUME = _misc_.wxEVT_POWER_RESUME
EVT_POWER_SUSPENDING = wx.PyEventBinder( wxEVT_POWER_SUSPENDING , 1 )
EVT_POWER_SUSPENDED = wx.PyEventBinder( wxEVT_POWER_SUSPENDED , 1 )
EVT_POWER_SUSPEND_CANCEL = wx.PyEventBinder( wxEVT_POWER_SUSPEND_CANCEL , 1 )
EVT_POWER_RESUME = wx.PyEventBinder( wxEVT_POWER_RESUME , 1 )
def GetPowerType(*args):
"""
GetPowerType() -> int
return the current system power state: online or offline
"""
return _misc_.GetPowerType(*args)
def GetBatteryState(*args):
"""
GetBatteryState() -> int
return approximate battery state
"""
return _misc_.GetBatteryState(*args)
wxPython/src/msw/_misc_wrap.cpp
+256 -63
View File
File diff suppressed because one or more lines are too long
wxPython/src/msw/_windows.py
+21 -20
View File
@@ -2147,6 +2147,9 @@ def GetColourFromUser(*args, **kwargs):
String caption=EmptyString) -> Colour
"""
return _windows_.GetColourFromUser(*args, **kwargs)
DD_NEW_DIR_BUTTON = _windows_.DD_NEW_DIR_BUTTON
DD_DEFAULT_STYLE = _windows_.DD_DEFAULT_STYLE
DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
class DirDialog(Dialog):
"""
wx.DirDialog allows the user to select a directory by browising the
@@ -2157,7 +2160,7 @@ class DirDialog(Dialog):
def __init__(self, *args, **kwargs):
"""
__init__(self, Window parent, String message=DirSelectorPromptStr,
String defaultPath=EmptyString, long style=0,
String defaultPath=EmptyString, long style=DD_DEFAULT_STYLE,
Point pos=DefaultPosition, Size size=DefaultSize,
String name=DirDialogNameStr) -> DirDialog
@@ -2200,6 +2203,19 @@ class DirDialog(Dialog):
_windows_.DirDialog_swigregister(DirDialog)
OPEN = _windows_.OPEN
SAVE = _windows_.SAVE
OVERWRITE_PROMPT = _windows_.OVERWRITE_PROMPT
FILE_MUST_EXIST = _windows_.FILE_MUST_EXIST
MULTIPLE = _windows_.MULTIPLE
CHANGE_DIR = _windows_.CHANGE_DIR
FD_OPEN = _windows_.FD_OPEN
FD_SAVE = _windows_.FD_SAVE
FD_OVERWRITE_PROMPT = _windows_.FD_OVERWRITE_PROMPT
FD_FILE_MUST_EXIST = _windows_.FD_FILE_MUST_EXIST
FD_MULTIPLE = _windows_.FD_MULTIPLE
FD_CHANGE_DIR = _windows_.FD_CHANGE_DIR
FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE
class FileDialog(Dialog):
"""
wx.FileDialog allows the user to select one or more files from the
@@ -2212,7 +2228,8 @@ class FileDialog(Dialog):
__init__(self, Window parent, String message=FileSelectorPromptStr,
String defaultDir=EmptyString, String defaultFile=EmptyString,
String wildcard=FileSelectorDefaultWildcardStr,
long style=0, Point pos=DefaultPosition) -> FileDialog
long style=FD_DEFAULT_STYLE,
Point pos=DefaultPosition) -> FileDialog
Constructor. Use ShowModal method to show the dialog.
"""
@@ -2264,14 +2281,6 @@ class FileDialog(Dialog):
"""
return _windows_.FileDialog_SetWildcard(*args, **kwargs)
def SetStyle(*args, **kwargs):
"""
SetStyle(self, long style)
Sets the dialog style.
"""
return _windows_.FileDialog_SetStyle(*args, **kwargs)
def SetFilterIndex(*args, **kwargs):
"""
SetFilterIndex(self, int filterIndex)
@@ -2320,14 +2329,6 @@ class FileDialog(Dialog):
"""
return _windows_.FileDialog_GetWildcard(*args, **kwargs)
def GetStyle(*args, **kwargs):
"""
GetStyle(self) -> long
Returns the dialog style.
"""
return _windows_.FileDialog_GetStyle(*args, **kwargs)
def GetFilterIndex(*args, **kwargs):
"""
GetFilterIndex(self) -> int
@@ -2758,11 +2759,11 @@ EVT_FIND_REPLACE_ALL = wx.PyEventBinder( wxEVT_COMMAND_FIND_REPLACE_ALL, 1 )
EVT_FIND_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_FIND_CLOSE, 1 )
# For backwards compatibility. Should they be removed?
EVT_COMMAND_FIND = EVT_FIND
EVT_COMMAND_FIND = EVT_FIND
EVT_COMMAND_FIND_NEXT = EVT_FIND_NEXT
EVT_COMMAND_FIND_REPLACE = EVT_FIND_REPLACE
EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL
EVT_COMMAND_FIND_CLOSE = EVT_FIND_CLOSE
EVT_COMMAND_FIND_CLOSE = EVT_FIND_CLOSE
class FindDialogEvent(_core.CommandEvent):
"""Events for the FindReplaceDialog"""
wxPython/src/msw/_windows_wrap.cpp
+18 -70
View File
@@ -16700,7 +16700,7 @@ SWIGINTERN PyObject *_wrap_new_DirDialog(PyObject *SWIGUNUSEDPARM(self), PyObjec
wxString *arg2 = (wxString *) &arg2_defvalue ;
wxString const &arg3_defvalue = wxPyEmptyString ;
wxString *arg3 = (wxString *) &arg3_defvalue ;
long arg4 = (long) 0 ;
long arg4 = (long) wxDD_DEFAULT_STYLE ;
wxPoint const &arg5_defvalue = wxDefaultPosition ;
wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
wxSize const &arg6_defvalue = wxDefaultSize ;
@@ -16992,7 +16992,7 @@ SWIGINTERN PyObject *_wrap_new_FileDialog(PyObject *SWIGUNUSEDPARM(self), PyObje
wxString *arg4 = (wxString *) &arg4_defvalue ;
wxString const &arg5_defvalue = wxPyFileSelectorDefaultWildcardStr ;
wxString *arg5 = (wxString *) &arg5_defvalue ;
long arg6 = (long) 0 ;
long arg6 = (long) wxFD_DEFAULT_STYLE ;
wxPoint const &arg7_defvalue = wxDefaultPosition ;
wxPoint *arg7 = (wxPoint *) &arg7_defvalue ;
wxFileDialog *result = 0 ;
@@ -17334,44 +17334,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_FileDialog_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
long arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
long val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "style", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFileDialog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FileDialog_SetStyle" "', expected argument " "1"" of type '" "wxFileDialog *""'");
}
arg1 = reinterpret_cast< wxFileDialog * >(argp1);
ecode2 = SWIG_AsVal_long(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FileDialog_SetStyle" "', expected argument " "2"" of type '" "long""'");
}
arg2 = static_cast< long >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetStyle(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
@@ -17580,34 +17542,6 @@ fail:
}
SWIGINTERN PyObject *_wrap_FileDialog_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
long result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFileDialog, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FileDialog_GetStyle" "', expected argument " "1"" of type '" "wxFileDialog const *""'");
}
arg1 = reinterpret_cast< wxFileDialog * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (long)((wxFileDialog const *)arg1)->GetStyle();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_long(static_cast< long >(result));
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_FileDialog_GetFilterIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxFileDialog *arg1 = (wxFileDialog *) 0 ;
@@ -31096,14 +31030,12 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"FileDialog_SetDirectory", (PyCFunction) _wrap_FileDialog_SetDirectory, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetFilename", (PyCFunction) _wrap_FileDialog_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetWildcard", (PyCFunction) _wrap_FileDialog_SetWildcard, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetStyle", (PyCFunction) _wrap_FileDialog_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_SetFilterIndex", (PyCFunction) _wrap_FileDialog_SetFilterIndex, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"FileDialog_GetMessage", (PyCFunction)_wrap_FileDialog_GetMessage, METH_O, NULL},
{ (char *)"FileDialog_GetPath", (PyCFunction)_wrap_FileDialog_GetPath, METH_O, NULL},
{ (char *)"FileDialog_GetDirectory", (PyCFunction)_wrap_FileDialog_GetDirectory, METH_O, NULL},
{ (char *)"FileDialog_GetFilename", (PyCFunction)_wrap_FileDialog_GetFilename, METH_O, NULL},
{ (char *)"FileDialog_GetWildcard", (PyCFunction)_wrap_FileDialog_GetWildcard, METH_O, NULL},
{ (char *)"FileDialog_GetStyle", (PyCFunction)_wrap_FileDialog_GetStyle, METH_O, NULL},
{ (char *)"FileDialog_GetFilterIndex", (PyCFunction)_wrap_FileDialog_GetFilterIndex, METH_O, NULL},
{ (char *)"FileDialog_GetFilenames", (PyCFunction)_wrap_FileDialog_GetFilenames, METH_O, NULL},
{ (char *)"FileDialog_GetPaths", (PyCFunction)_wrap_FileDialog_GetPaths, METH_O, NULL},
@@ -33803,6 +33735,22 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
SWIG_addvarlink(SWIG_globals(),(char*)"GetTextFromUserPromptStr",GetTextFromUserPromptStr_get, GetTextFromUserPromptStr_set);
SWIG_addvarlink(SWIG_globals(),(char*)"MessageBoxCaptionStr",MessageBoxCaptionStr_get, MessageBoxCaptionStr_set);
SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST)));
SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE)));
SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR)));
SWIG_Python_SetConstant(d, "FD_OPEN",SWIG_From_int(static_cast< int >(wxFD_OPEN)));
SWIG_Python_SetConstant(d, "FD_SAVE",SWIG_From_int(static_cast< int >(wxFD_SAVE)));
SWIG_Python_SetConstant(d, "FD_OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxFD_OVERWRITE_PROMPT)));
SWIG_Python_SetConstant(d, "FD_FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFD_FILE_MUST_EXIST)));
SWIG_Python_SetConstant(d, "FD_MULTIPLE",SWIG_From_int(static_cast< int >(wxFD_MULTIPLE)));
SWIG_Python_SetConstant(d, "FD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxFD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "FD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxFD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "CHOICEDLG_STYLE",SWIG_From_int(static_cast< int >(wxCHOICEDLG_STYLE)));
SWIG_Python_SetConstant(d, "TextEntryDialogStyle",SWIG_From_int(static_cast< int >(wxTextEntryDialogStyle)));
SWIG_addvarlink(SWIG_globals(),(char*)"GetPasswordFromUserPromptStr",GetPasswordFromUserPromptStr_get, GetPasswordFromUserPromptStr_set);
wxPython/src/msw/html.py
+2 -6
View File
@@ -686,10 +686,6 @@ class HtmlCell(_core.Object):
"""ProcessMouseClick(self, HtmlWindowInterface window, Point pos, MouseEvent event) -> bool"""
return _html.HtmlCell_ProcessMouseClick(*args, **kwargs)
def AdjustPagebreak(*args, **kwargs):
"""AdjustPagebreak(self, int INOUT) -> bool"""
return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)
def SetCanLiveOnPagebreak(*args, **kwargs):
"""SetCanLiveOnPagebreak(self, bool can)"""
return _html.HtmlCell_SetCanLiveOnPagebreak(*args, **kwargs)
@@ -1197,8 +1193,8 @@ class HtmlDCRenderer(_core.Object):
def Render(*args, **kwargs):
"""
Render(self, int x, int y, int from=0, int dont_render=False, int maxHeight=INT_MAX,
int choices=None, int LCOUNT=0) -> int
Render(self, int x, int y, wxArrayInt known_pagebreaks, int from=0,
int dont_render=False, int to=INT_MAX) -> int
"""
return _html.HtmlDCRenderer_Render(*args, **kwargs)
wxPython/src/msw/html_wrap.cpp
+230 -275
View File
File diff suppressed because it is too large Load Diff