minor additions and bugfixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-10-09 23:13:43 +00:00
parent 06c0fba410
commit bc29c5e0e1
11 changed files with 1371 additions and 1024 deletions
+98
View File
@@ -286,6 +286,23 @@ static PyObject *_wrap_wxImage_AddHandler(PyObject *self, PyObject *args, PyObje
return _resultobj;
}
static PyObject *_wrap_wxInitAllImageHandlers(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxInitAllImageHandlers",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
wxInitAllImageHandlers();
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define new_wxImageHandler() (new wxImageHandler())
static PyObject *_wrap_new_wxImageHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -714,6 +731,72 @@ static PyObject *_wrap_new_wxGIFHandler(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
static void *SwigwxPNMHandlerTowxImageHandler(void *ptr) {
wxPNMHandler *src;
wxImageHandler *dest;
src = (wxPNMHandler *) ptr;
dest = (wxImageHandler *) src;
return (void *) dest;
}
#define new_wxPNMHandler() (new wxPNMHandler())
static PyObject *_wrap_new_wxPNMHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPNMHandler * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPNMHandler",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxPNMHandler *)new_wxPNMHandler();
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPNMHandler_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
static void *SwigwxPCXHandlerTowxImageHandler(void *ptr) {
wxPCXHandler *src;
wxImageHandler *dest;
src = (wxPCXHandler *) ptr;
dest = (wxImageHandler *) src;
return (void *) dest;
}
#define new_wxPCXHandler() (new wxPCXHandler())
static PyObject *_wrap_new_wxPCXHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPCXHandler * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPCXHandler",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxPCXHandler *)new_wxPCXHandler();
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPCXHandler_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define new_wxImage(_swigarg0,_swigarg1) (new wxImage(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1582,6 +1665,8 @@ static PyMethodDef imagecMethods[] = {
{ "wxImage_ConvertToBitmap", (PyCFunction) _wrap_wxImage_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxImage", (PyCFunction) _wrap_delete_wxImage, METH_VARARGS | METH_KEYWORDS },
{ "new_wxImage", (PyCFunction) _wrap_new_wxImage, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPCXHandler", (PyCFunction) _wrap_new_wxPCXHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPNMHandler", (PyCFunction) _wrap_new_wxPNMHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxGIFHandler", (PyCFunction) _wrap_new_wxGIFHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxBMPHandler", (PyCFunction) _wrap_new_wxBMPHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxJPEGHandler", (PyCFunction) _wrap_new_wxJPEGHandler, METH_VARARGS | METH_KEYWORDS },
@@ -1595,6 +1680,7 @@ static PyMethodDef imagecMethods[] = {
{ "wxImageHandler_GetExtension", (PyCFunction) _wrap_wxImageHandler_GetExtension, METH_VARARGS | METH_KEYWORDS },
{ "wxImageHandler_GetName", (PyCFunction) _wrap_wxImageHandler_GetName, METH_VARARGS | METH_KEYWORDS },
{ "new_wxImageHandler", (PyCFunction) _wrap_new_wxImageHandler, METH_VARARGS | METH_KEYWORDS },
{ "wxInitAllImageHandlers", (PyCFunction) _wrap_wxInitAllImageHandlers, METH_VARARGS | METH_KEYWORDS },
{ "wxImage_AddHandler", (PyCFunction) _wrap_wxImage_AddHandler, METH_VARARGS | METH_KEYWORDS },
{ "wxImageFromBitmap", (PyCFunction) _wrap_wxImageFromBitmap, METH_VARARGS | METH_KEYWORDS },
{ "wxImageFromMime", (PyCFunction) _wrap_wxImageFromMime, METH_VARARGS | METH_KEYWORDS },
@@ -1625,6 +1711,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxGIFHandler","_class_wxGIFHandler",0},
{ "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
{ "_wxCursor","_class_wxCursor",0},
{ "_wxImageHandler","_class_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler},
{ "_wxImageHandler","_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler},
{ "_wxImageHandler","_class_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler},
{ "_wxImageHandler","_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler},
{ "_wxImageHandler","_class_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler},
{ "_wxImageHandler","_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler},
{ "_wxImageHandler","_class_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler},
@@ -1651,6 +1741,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxPNMHandler","_class_wxPNMHandler",0},
{ "_class_wxGIFHandler","_wxGIFHandler",0},
{ "_class_wxPostScriptDC","_wxPostScriptDC",0},
{ "_class_wxMask","_wxMask",0},
@@ -1665,6 +1756,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxRect","_class_wxRect",0},
{ "_class_wxImage","_wxImage",0},
{ "_wxPoint","_class_wxPoint",0},
{ "_class_wxPNMHandler","_wxPNMHandler",0},
{ "_wxBitmap","_class_wxBitmap",0},
{ "_wxPyTimer","_class_wxPyTimer",0},
{ "_wxWindowDC","_class_wxWindowDC",0},
@@ -1705,6 +1797,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_wxPostScriptDC","_class_wxPostScriptDC",0},
{ "_class_wxImageHandler","_class_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler},
{ "_class_wxImageHandler","_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler},
{ "_class_wxImageHandler","_class_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler},
{ "_class_wxImageHandler","_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler},
{ "_class_wxImageHandler","_class_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler},
{ "_class_wxImageHandler","_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler},
{ "_class_wxImageHandler","_class_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler},
@@ -1726,6 +1822,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_short","_unsigned_short",0},
{ "_short","_signed_short",0},
{ "_class_wxImageList","_wxImageList",0},
{ "_wxPCXHandler","_class_wxPCXHandler",0},
{ "_wxJPEGHandler","_class_wxJPEGHandler",0},
{ "_wxWindowID","_wxPrintQuality",0},
{ "_wxWindowID","_size_t",0},
@@ -1750,6 +1847,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxScreenDC","_wxScreenDC",0},
{ "_wxPalette","_class_wxPalette",0},
{ "_wxRegion","_class_wxRegion",0},
{ "_class_wxPCXHandler","_wxPCXHandler",0},
{ "_class_wxClientDC","_wxClientDC",0},
{ "_class_wxSize","_wxSize",0},
{ "_class_wxBitmap","_wxBitmap",0},
+30
View File
@@ -98,6 +98,34 @@ class wxGIFHandler(wxGIFHandlerPtr):
class wxPNMHandlerPtr(wxImageHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxPNMHandler instance at %s>" % (self.this,)
class wxPNMHandler(wxPNMHandlerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(imagec.new_wxPNMHandler,_args,_kwargs)
self.thisown = 1
class wxPCXHandlerPtr(wxImageHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxPCXHandler instance at %s>" % (self.this,)
class wxPCXHandler(wxPCXHandlerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(imagec.new_wxPCXHandler,_args,_kwargs)
self.thisown = 1
class wxImagePtr :
def __init__(self,this):
self.this = this
@@ -215,6 +243,8 @@ def wxImageFromBitmap(*_args, **_kwargs):
wxImage_AddHandler = imagec.wxImage_AddHandler
wxInitAllImageHandlers = imagec.wxInitAllImageHandlers
#-------------- VARIABLE WRAPPERS ------------------
File diff suppressed because it is too large Load Diff
+11 -145
View File
@@ -388,6 +388,9 @@ class wxRegionPtr :
def Intersect(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Intersect,(self,) + _args, _kwargs)
return val
def IsEmpty(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_IsEmpty,(self,) + _args, _kwargs)
return val
def Subtract(self, *_args, **_kwargs):
val = apply(miscc.wxRegion_Subtract,(self,) + _args, _kwargs)
return val
@@ -505,24 +508,6 @@ class wxAcceleratorTable(wxAcceleratorTablePtr):
#-------------- FUNCTION WRAPPERS ------------------
wxFileSelector = miscc.wxFileSelector
wxGetTextFromUser = miscc.wxGetTextFromUser
wxGetSingleChoice = miscc.wxGetSingleChoice
wxGetSingleChoiceIndex = miscc.wxGetSingleChoiceIndex
wxMessageBox = miscc.wxMessageBox
wxGetNumberFromUser = miscc.wxGetNumberFromUser
wxColourDisplay = miscc.wxColourDisplay
wxDisplayDepth = miscc.wxDisplayDepth
wxSetCursor = miscc.wxSetCursor
wxNewId = miscc.wxNewId
wxRegisterId = miscc.wxRegisterId
@@ -531,8 +516,6 @@ NewId = miscc.NewId
RegisterId = miscc.RegisterId
wxBeginBusyCursor = miscc.wxBeginBusyCursor
wxBell = miscc.wxBell
wxDisplaySize = miscc.wxDisplaySize
@@ -541,12 +524,20 @@ wxEndBusyCursor = miscc.wxEndBusyCursor
wxExecute = miscc.wxExecute
wxGetElapsedTime = miscc.wxGetElapsedTime
wxGetMousePosition = miscc.wxGetMousePosition
wxIsBusy = miscc.wxIsBusy
wxNow = miscc.wxNow
wxShell = miscc.wxShell
wxStartTimer = miscc.wxStartTimer
wxGetOsVersion = miscc.wxGetOsVersion
wxSleep = miscc.wxSleep
wxYield = miscc.wxYield
@@ -557,45 +548,6 @@ wxEnableTopLevelWindows = miscc.wxEnableTopLevelWindows
wxGetResource = miscc.wxGetResource
wxResourceAddIdentifier = miscc.wxResourceAddIdentifier
wxResourceClear = miscc.wxResourceClear
def wxResourceCreateBitmap(*_args, **_kwargs):
val = apply(miscc.wxResourceCreateBitmap,_args,_kwargs)
if val: val = wxBitmapPtr(val); val.thisown = 1
return val
def wxResourceCreateIcon(*_args, **_kwargs):
val = apply(miscc.wxResourceCreateIcon,_args,_kwargs)
if val: val = wxIconPtr(val); val.thisown = 1
return val
def wxResourceCreateMenuBar(*_args, **_kwargs):
val = apply(miscc.wxResourceCreateMenuBar,_args,_kwargs)
if val: val = wxMenuBarPtr(val)
return val
wxResourceGetIdentifier = miscc.wxResourceGetIdentifier
wxResourceParseData = miscc.wxResourceParseData
wxResourceParseFile = miscc.wxResourceParseFile
wxResourceParseString = miscc.wxResourceParseString
def wxSystemSettings_GetSystemColour(*_args, **_kwargs):
val = apply(miscc.wxSystemSettings_GetSystemColour,_args,_kwargs)
if val: val = wxColourPtr(val); val.thisown = 1
return val
def wxSystemSettings_GetSystemFont(*_args, **_kwargs):
val = apply(miscc.wxSystemSettings_GetSystemFont,_args,_kwargs)
if val: val = wxFontPtr(val); val.thisown = 1
return val
wxSystemSettings_GetSystemMetric = miscc.wxSystemSettings_GetSystemMetric
#-------------- VARIABLE WRAPPERS ------------------
@@ -622,89 +574,3 @@ wxAbsolute = miscc.wxAbsolute
wxOutRegion = miscc.wxOutRegion
wxPartRegion = miscc.wxPartRegion
wxInRegion = miscc.wxInRegion
wxSYS_WHITE_BRUSH = miscc.wxSYS_WHITE_BRUSH
wxSYS_LTGRAY_BRUSH = miscc.wxSYS_LTGRAY_BRUSH
wxSYS_GRAY_BRUSH = miscc.wxSYS_GRAY_BRUSH
wxSYS_DKGRAY_BRUSH = miscc.wxSYS_DKGRAY_BRUSH
wxSYS_BLACK_BRUSH = miscc.wxSYS_BLACK_BRUSH
wxSYS_NULL_BRUSH = miscc.wxSYS_NULL_BRUSH
wxSYS_HOLLOW_BRUSH = miscc.wxSYS_HOLLOW_BRUSH
wxSYS_WHITE_PEN = miscc.wxSYS_WHITE_PEN
wxSYS_BLACK_PEN = miscc.wxSYS_BLACK_PEN
wxSYS_NULL_PEN = miscc.wxSYS_NULL_PEN
wxSYS_OEM_FIXED_FONT = miscc.wxSYS_OEM_FIXED_FONT
wxSYS_ANSI_FIXED_FONT = miscc.wxSYS_ANSI_FIXED_FONT
wxSYS_ANSI_VAR_FONT = miscc.wxSYS_ANSI_VAR_FONT
wxSYS_SYSTEM_FONT = miscc.wxSYS_SYSTEM_FONT
wxSYS_DEVICE_DEFAULT_FONT = miscc.wxSYS_DEVICE_DEFAULT_FONT
wxSYS_DEFAULT_PALETTE = miscc.wxSYS_DEFAULT_PALETTE
wxSYS_SYSTEM_FIXED_FONT = miscc.wxSYS_SYSTEM_FIXED_FONT
wxSYS_DEFAULT_GUI_FONT = miscc.wxSYS_DEFAULT_GUI_FONT
wxSYS_COLOUR_SCROLLBAR = miscc.wxSYS_COLOUR_SCROLLBAR
wxSYS_COLOUR_BACKGROUND = miscc.wxSYS_COLOUR_BACKGROUND
wxSYS_COLOUR_ACTIVECAPTION = miscc.wxSYS_COLOUR_ACTIVECAPTION
wxSYS_COLOUR_INACTIVECAPTION = miscc.wxSYS_COLOUR_INACTIVECAPTION
wxSYS_COLOUR_MENU = miscc.wxSYS_COLOUR_MENU
wxSYS_COLOUR_WINDOW = miscc.wxSYS_COLOUR_WINDOW
wxSYS_COLOUR_WINDOWFRAME = miscc.wxSYS_COLOUR_WINDOWFRAME
wxSYS_COLOUR_MENUTEXT = miscc.wxSYS_COLOUR_MENUTEXT
wxSYS_COLOUR_WINDOWTEXT = miscc.wxSYS_COLOUR_WINDOWTEXT
wxSYS_COLOUR_CAPTIONTEXT = miscc.wxSYS_COLOUR_CAPTIONTEXT
wxSYS_COLOUR_ACTIVEBORDER = miscc.wxSYS_COLOUR_ACTIVEBORDER
wxSYS_COLOUR_INACTIVEBORDER = miscc.wxSYS_COLOUR_INACTIVEBORDER
wxSYS_COLOUR_APPWORKSPACE = miscc.wxSYS_COLOUR_APPWORKSPACE
wxSYS_COLOUR_HIGHLIGHT = miscc.wxSYS_COLOUR_HIGHLIGHT
wxSYS_COLOUR_HIGHLIGHTTEXT = miscc.wxSYS_COLOUR_HIGHLIGHTTEXT
wxSYS_COLOUR_BTNFACE = miscc.wxSYS_COLOUR_BTNFACE
wxSYS_COLOUR_BTNSHADOW = miscc.wxSYS_COLOUR_BTNSHADOW
wxSYS_COLOUR_GRAYTEXT = miscc.wxSYS_COLOUR_GRAYTEXT
wxSYS_COLOUR_BTNTEXT = miscc.wxSYS_COLOUR_BTNTEXT
wxSYS_COLOUR_INACTIVECAPTIONTEXT = miscc.wxSYS_COLOUR_INACTIVECAPTIONTEXT
wxSYS_COLOUR_BTNHIGHLIGHT = miscc.wxSYS_COLOUR_BTNHIGHLIGHT
wxSYS_COLOUR_3DDKSHADOW = miscc.wxSYS_COLOUR_3DDKSHADOW
wxSYS_COLOUR_3DLIGHT = miscc.wxSYS_COLOUR_3DLIGHT
wxSYS_COLOUR_INFOTEXT = miscc.wxSYS_COLOUR_INFOTEXT
wxSYS_COLOUR_INFOBK = miscc.wxSYS_COLOUR_INFOBK
wxSYS_COLOUR_DESKTOP = miscc.wxSYS_COLOUR_DESKTOP
wxSYS_COLOUR_3DFACE = miscc.wxSYS_COLOUR_3DFACE
wxSYS_COLOUR_3DSHADOW = miscc.wxSYS_COLOUR_3DSHADOW
wxSYS_COLOUR_3DHIGHLIGHT = miscc.wxSYS_COLOUR_3DHIGHLIGHT
wxSYS_COLOUR_3DHILIGHT = miscc.wxSYS_COLOUR_3DHILIGHT
wxSYS_COLOUR_BTNHILIGHT = miscc.wxSYS_COLOUR_BTNHILIGHT
wxSYS_MOUSE_BUTTONS = miscc.wxSYS_MOUSE_BUTTONS
wxSYS_BORDER_X = miscc.wxSYS_BORDER_X
wxSYS_BORDER_Y = miscc.wxSYS_BORDER_Y
wxSYS_CURSOR_X = miscc.wxSYS_CURSOR_X
wxSYS_CURSOR_Y = miscc.wxSYS_CURSOR_Y
wxSYS_DCLICK_X = miscc.wxSYS_DCLICK_X
wxSYS_DCLICK_Y = miscc.wxSYS_DCLICK_Y
wxSYS_DRAG_X = miscc.wxSYS_DRAG_X
wxSYS_DRAG_Y = miscc.wxSYS_DRAG_Y
wxSYS_EDGE_X = miscc.wxSYS_EDGE_X
wxSYS_EDGE_Y = miscc.wxSYS_EDGE_Y
wxSYS_HSCROLL_ARROW_X = miscc.wxSYS_HSCROLL_ARROW_X
wxSYS_HSCROLL_ARROW_Y = miscc.wxSYS_HSCROLL_ARROW_Y
wxSYS_HTHUMB_X = miscc.wxSYS_HTHUMB_X
wxSYS_ICON_X = miscc.wxSYS_ICON_X
wxSYS_ICON_Y = miscc.wxSYS_ICON_Y
wxSYS_ICONSPACING_X = miscc.wxSYS_ICONSPACING_X
wxSYS_ICONSPACING_Y = miscc.wxSYS_ICONSPACING_Y
wxSYS_WINDOWMIN_X = miscc.wxSYS_WINDOWMIN_X
wxSYS_WINDOWMIN_Y = miscc.wxSYS_WINDOWMIN_Y
wxSYS_SCREEN_X = miscc.wxSYS_SCREEN_X
wxSYS_SCREEN_Y = miscc.wxSYS_SCREEN_Y
wxSYS_FRAMESIZE_X = miscc.wxSYS_FRAMESIZE_X
wxSYS_FRAMESIZE_Y = miscc.wxSYS_FRAMESIZE_Y
wxSYS_SMALLICON_X = miscc.wxSYS_SMALLICON_X
wxSYS_SMALLICON_Y = miscc.wxSYS_SMALLICON_Y
wxSYS_HSCROLL_Y = miscc.wxSYS_HSCROLL_Y
wxSYS_VSCROLL_X = miscc.wxSYS_VSCROLL_X
wxSYS_VSCROLL_ARROW_X = miscc.wxSYS_VSCROLL_ARROW_X
wxSYS_VSCROLL_ARROW_Y = miscc.wxSYS_VSCROLL_ARROW_Y
wxSYS_VTHUMB_Y = miscc.wxSYS_VTHUMB_Y
wxSYS_CAPTION_Y = miscc.wxSYS_CAPTION_Y
wxSYS_MENU_Y = miscc.wxSYS_MENU_Y
wxSYS_NETWORK_PRESENT = miscc.wxSYS_NETWORK_PRESENT
wxSYS_PENWINDOWS_PRESENT = miscc.wxSYS_PENWINDOWS_PRESENT
wxSYS_SHOW_SOUNDS = miscc.wxSYS_SHOW_SOUNDS
wxSYS_SWAP_BUTTONS = miscc.wxSYS_SWAP_BUTTONS
File diff suppressed because it is too large Load Diff
+150
View File
@@ -93,6 +93,24 @@ class wxCaret(wxCaretPtr):
#-------------- FUNCTION WRAPPERS ------------------
wxFileSelector = misc2c.wxFileSelector
wxGetTextFromUser = misc2c.wxGetTextFromUser
wxGetSingleChoice = misc2c.wxGetSingleChoice
wxGetSingleChoiceIndex = misc2c.wxGetSingleChoiceIndex
wxMessageBox = misc2c.wxMessageBox
wxGetNumberFromUser = misc2c.wxGetNumberFromUser
wxColourDisplay = misc2c.wxColourDisplay
wxDisplayDepth = misc2c.wxDisplayDepth
wxSetCursor = misc2c.wxSetCursor
def wxFindWindowByLabel(*_args, **_kwargs):
val = apply(misc2c.wxFindWindowByLabel,_args,_kwargs)
if val: val = wxWindowPtr(val)
@@ -103,6 +121,52 @@ def wxFindWindowByName(*_args, **_kwargs):
if val: val = wxWindowPtr(val)
return val
wxBeginBusyCursor = misc2c.wxBeginBusyCursor
def wxGetActiveWindow(*_args, **_kwargs):
val = apply(misc2c.wxGetActiveWindow,_args,_kwargs)
if val: val = wxWindowPtr(val)
return val
wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
wxResourceClear = misc2c.wxResourceClear
def wxResourceCreateBitmap(*_args, **_kwargs):
val = apply(misc2c.wxResourceCreateBitmap,_args,_kwargs)
if val: val = wxBitmapPtr(val); val.thisown = 1
return val
def wxResourceCreateIcon(*_args, **_kwargs):
val = apply(misc2c.wxResourceCreateIcon,_args,_kwargs)
if val: val = wxIconPtr(val); val.thisown = 1
return val
def wxResourceCreateMenuBar(*_args, **_kwargs):
val = apply(misc2c.wxResourceCreateMenuBar,_args,_kwargs)
if val: val = wxMenuBarPtr(val)
return val
wxResourceGetIdentifier = misc2c.wxResourceGetIdentifier
wxResourceParseData = misc2c.wxResourceParseData
wxResourceParseFile = misc2c.wxResourceParseFile
wxResourceParseString = misc2c.wxResourceParseString
def wxSystemSettings_GetSystemColour(*_args, **_kwargs):
val = apply(misc2c.wxSystemSettings_GetSystemColour,_args,_kwargs)
if val: val = wxColourPtr(val); val.thisown = 1
return val
def wxSystemSettings_GetSystemFont(*_args, **_kwargs):
val = apply(misc2c.wxSystemSettings_GetSystemFont,_args,_kwargs)
if val: val = wxFontPtr(val); val.thisown = 1
return val
wxSystemSettings_GetSystemMetric = misc2c.wxSystemSettings_GetSystemMetric
wxToolTip_Enable = misc2c.wxToolTip_Enable
wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay
@@ -115,3 +179,89 @@ wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime
#-------------- VARIABLE WRAPPERS ------------------
wxSYS_WHITE_BRUSH = misc2c.wxSYS_WHITE_BRUSH
wxSYS_LTGRAY_BRUSH = misc2c.wxSYS_LTGRAY_BRUSH
wxSYS_GRAY_BRUSH = misc2c.wxSYS_GRAY_BRUSH
wxSYS_DKGRAY_BRUSH = misc2c.wxSYS_DKGRAY_BRUSH
wxSYS_BLACK_BRUSH = misc2c.wxSYS_BLACK_BRUSH
wxSYS_NULL_BRUSH = misc2c.wxSYS_NULL_BRUSH
wxSYS_HOLLOW_BRUSH = misc2c.wxSYS_HOLLOW_BRUSH
wxSYS_WHITE_PEN = misc2c.wxSYS_WHITE_PEN
wxSYS_BLACK_PEN = misc2c.wxSYS_BLACK_PEN
wxSYS_NULL_PEN = misc2c.wxSYS_NULL_PEN
wxSYS_OEM_FIXED_FONT = misc2c.wxSYS_OEM_FIXED_FONT
wxSYS_ANSI_FIXED_FONT = misc2c.wxSYS_ANSI_FIXED_FONT
wxSYS_ANSI_VAR_FONT = misc2c.wxSYS_ANSI_VAR_FONT
wxSYS_SYSTEM_FONT = misc2c.wxSYS_SYSTEM_FONT
wxSYS_DEVICE_DEFAULT_FONT = misc2c.wxSYS_DEVICE_DEFAULT_FONT
wxSYS_DEFAULT_PALETTE = misc2c.wxSYS_DEFAULT_PALETTE
wxSYS_SYSTEM_FIXED_FONT = misc2c.wxSYS_SYSTEM_FIXED_FONT
wxSYS_DEFAULT_GUI_FONT = misc2c.wxSYS_DEFAULT_GUI_FONT
wxSYS_COLOUR_SCROLLBAR = misc2c.wxSYS_COLOUR_SCROLLBAR
wxSYS_COLOUR_BACKGROUND = misc2c.wxSYS_COLOUR_BACKGROUND
wxSYS_COLOUR_ACTIVECAPTION = misc2c.wxSYS_COLOUR_ACTIVECAPTION
wxSYS_COLOUR_INACTIVECAPTION = misc2c.wxSYS_COLOUR_INACTIVECAPTION
wxSYS_COLOUR_MENU = misc2c.wxSYS_COLOUR_MENU
wxSYS_COLOUR_WINDOW = misc2c.wxSYS_COLOUR_WINDOW
wxSYS_COLOUR_WINDOWFRAME = misc2c.wxSYS_COLOUR_WINDOWFRAME
wxSYS_COLOUR_MENUTEXT = misc2c.wxSYS_COLOUR_MENUTEXT
wxSYS_COLOUR_WINDOWTEXT = misc2c.wxSYS_COLOUR_WINDOWTEXT
wxSYS_COLOUR_CAPTIONTEXT = misc2c.wxSYS_COLOUR_CAPTIONTEXT
wxSYS_COLOUR_ACTIVEBORDER = misc2c.wxSYS_COLOUR_ACTIVEBORDER
wxSYS_COLOUR_INACTIVEBORDER = misc2c.wxSYS_COLOUR_INACTIVEBORDER
wxSYS_COLOUR_APPWORKSPACE = misc2c.wxSYS_COLOUR_APPWORKSPACE
wxSYS_COLOUR_HIGHLIGHT = misc2c.wxSYS_COLOUR_HIGHLIGHT
wxSYS_COLOUR_HIGHLIGHTTEXT = misc2c.wxSYS_COLOUR_HIGHLIGHTTEXT
wxSYS_COLOUR_BTNFACE = misc2c.wxSYS_COLOUR_BTNFACE
wxSYS_COLOUR_BTNSHADOW = misc2c.wxSYS_COLOUR_BTNSHADOW
wxSYS_COLOUR_GRAYTEXT = misc2c.wxSYS_COLOUR_GRAYTEXT
wxSYS_COLOUR_BTNTEXT = misc2c.wxSYS_COLOUR_BTNTEXT
wxSYS_COLOUR_INACTIVECAPTIONTEXT = misc2c.wxSYS_COLOUR_INACTIVECAPTIONTEXT
wxSYS_COLOUR_BTNHIGHLIGHT = misc2c.wxSYS_COLOUR_BTNHIGHLIGHT
wxSYS_COLOUR_3DDKSHADOW = misc2c.wxSYS_COLOUR_3DDKSHADOW
wxSYS_COLOUR_3DLIGHT = misc2c.wxSYS_COLOUR_3DLIGHT
wxSYS_COLOUR_INFOTEXT = misc2c.wxSYS_COLOUR_INFOTEXT
wxSYS_COLOUR_INFOBK = misc2c.wxSYS_COLOUR_INFOBK
wxSYS_COLOUR_DESKTOP = misc2c.wxSYS_COLOUR_DESKTOP
wxSYS_COLOUR_3DFACE = misc2c.wxSYS_COLOUR_3DFACE
wxSYS_COLOUR_3DSHADOW = misc2c.wxSYS_COLOUR_3DSHADOW
wxSYS_COLOUR_3DHIGHLIGHT = misc2c.wxSYS_COLOUR_3DHIGHLIGHT
wxSYS_COLOUR_3DHILIGHT = misc2c.wxSYS_COLOUR_3DHILIGHT
wxSYS_COLOUR_BTNHILIGHT = misc2c.wxSYS_COLOUR_BTNHILIGHT
wxSYS_MOUSE_BUTTONS = misc2c.wxSYS_MOUSE_BUTTONS
wxSYS_BORDER_X = misc2c.wxSYS_BORDER_X
wxSYS_BORDER_Y = misc2c.wxSYS_BORDER_Y
wxSYS_CURSOR_X = misc2c.wxSYS_CURSOR_X
wxSYS_CURSOR_Y = misc2c.wxSYS_CURSOR_Y
wxSYS_DCLICK_X = misc2c.wxSYS_DCLICK_X
wxSYS_DCLICK_Y = misc2c.wxSYS_DCLICK_Y
wxSYS_DRAG_X = misc2c.wxSYS_DRAG_X
wxSYS_DRAG_Y = misc2c.wxSYS_DRAG_Y
wxSYS_EDGE_X = misc2c.wxSYS_EDGE_X
wxSYS_EDGE_Y = misc2c.wxSYS_EDGE_Y
wxSYS_HSCROLL_ARROW_X = misc2c.wxSYS_HSCROLL_ARROW_X
wxSYS_HSCROLL_ARROW_Y = misc2c.wxSYS_HSCROLL_ARROW_Y
wxSYS_HTHUMB_X = misc2c.wxSYS_HTHUMB_X
wxSYS_ICON_X = misc2c.wxSYS_ICON_X
wxSYS_ICON_Y = misc2c.wxSYS_ICON_Y
wxSYS_ICONSPACING_X = misc2c.wxSYS_ICONSPACING_X
wxSYS_ICONSPACING_Y = misc2c.wxSYS_ICONSPACING_Y
wxSYS_WINDOWMIN_X = misc2c.wxSYS_WINDOWMIN_X
wxSYS_WINDOWMIN_Y = misc2c.wxSYS_WINDOWMIN_Y
wxSYS_SCREEN_X = misc2c.wxSYS_SCREEN_X
wxSYS_SCREEN_Y = misc2c.wxSYS_SCREEN_Y
wxSYS_FRAMESIZE_X = misc2c.wxSYS_FRAMESIZE_X
wxSYS_FRAMESIZE_Y = misc2c.wxSYS_FRAMESIZE_Y
wxSYS_SMALLICON_X = misc2c.wxSYS_SMALLICON_X
wxSYS_SMALLICON_Y = misc2c.wxSYS_SMALLICON_Y
wxSYS_HSCROLL_Y = misc2c.wxSYS_HSCROLL_Y
wxSYS_VSCROLL_X = misc2c.wxSYS_VSCROLL_X
wxSYS_VSCROLL_ARROW_X = misc2c.wxSYS_VSCROLL_ARROW_X
wxSYS_VSCROLL_ARROW_Y = misc2c.wxSYS_VSCROLL_ARROW_Y
wxSYS_VTHUMB_Y = misc2c.wxSYS_VTHUMB_Y
wxSYS_CAPTION_Y = misc2c.wxSYS_CAPTION_Y
wxSYS_MENU_Y = misc2c.wxSYS_MENU_Y
wxSYS_NETWORK_PRESENT = misc2c.wxSYS_NETWORK_PRESENT
wxSYS_PENWINDOWS_PRESENT = misc2c.wxSYS_PENWINDOWS_PRESENT
wxSYS_SHOW_SOUNDS = misc2c.wxSYS_SHOW_SOUNDS
wxSYS_SWAP_BUTTONS = misc2c.wxSYS_SWAP_BUTTONS
+28
View File
@@ -6605,6 +6605,33 @@ static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *self, PyObject *args, PyObjec
return _resultobj;
}
#define wxMenuBar_Refresh(_swigobj) (_swigobj->Refresh())
static PyObject *_wrap_wxMenuBar_Refresh(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxMenuBar * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuBar_Refresh",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuBar_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_Refresh. Expected _wxMenuBar_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxMenuBar_Refresh(_arg0);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define new_wxMenuItem() (new wxMenuItem())
static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -7017,6 +7044,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxMenuItem_IsEnabled", (PyCFunction) _wrap_wxMenuItem_IsEnabled, METH_VARARGS | METH_KEYWORDS },
{ "wxMenuItem_IsSeparator", (PyCFunction) _wrap_wxMenuItem_IsSeparator, METH_VARARGS | METH_KEYWORDS },
{ "new_wxMenuItem", (PyCFunction) _wrap_new_wxMenuItem, METH_VARARGS | METH_KEYWORDS },
{ "wxMenuBar_Refresh", (PyCFunction) _wrap_wxMenuBar_Refresh, METH_VARARGS | METH_KEYWORDS },
{ "wxMenuBar_GetMenu", (PyCFunction) _wrap_wxMenuBar_GetMenu, METH_VARARGS | METH_KEYWORDS },
{ "wxMenuBar_GetMenuCount", (PyCFunction) _wrap_wxMenuBar_GetMenuCount, METH_VARARGS | METH_KEYWORDS },
{ "wxMenuBar_SetLabelTop", (PyCFunction) _wrap_wxMenuBar_SetLabelTop, METH_VARARGS | METH_KEYWORDS },
+3
View File
@@ -707,6 +707,9 @@ class wxMenuBarPtr(wxEvtHandlerPtr):
val = apply(windowsc.wxMenuBar_GetMenu,(self,) + _args, _kwargs)
if val: val = wxMenuPtr(val)
return val
def Refresh(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuBar_Refresh,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxMenuBar instance at %s>" % (self.this,)
class wxMenuBar(wxMenuBarPtr):
+6
View File
@@ -1686,6 +1686,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
{ "_wxPNMHandler","_class_wxPNMHandler",0},
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
{ "_class_wxMenuItem","_wxMenuItem",0},
{ "_class_wxPaintEvent","_wxPaintEvent",0},
@@ -1739,6 +1740,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxButton","_wxButton",0},
{ "_wxRadioBox","_class_wxRadioBox",0},
{ "_class_wxFontData","_wxFontData",0},
{ "_class_wxPNMHandler","_wxPNMHandler",0},
{ "_wxBoxSizer","_class_wxBoxSizer",0},
{ "_class___wxPyCleanup","___wxPyCleanup",0},
{ "_wxBitmap","_class_wxBitmap",0},
@@ -1882,6 +1884,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxImageList","_wxImageList",0},
{ "_class_wxBitmapButton","_wxBitmapButton",0},
{ "_wxFrame","_class_wxFrame",0},
{ "_wxPCXHandler","_class_wxPCXHandler",0},
{ "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
{ "_class_wxNotebook","_wxNotebook",0},
{ "_wxJPEGHandler","_class_wxJPEGHandler",0},
@@ -1942,6 +1945,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPreviewFrame","_class_wxPreviewFrame",0},
{ "_wxSizer","_class_wxSizer",0},
{ "_class_wxShowEvent","_wxShowEvent",0},
{ "_class_wxPCXHandler","_wxPCXHandler",0},
{ "_wxActivateEvent","_class_wxActivateEvent",0},
{ "_wxGauge","_class_wxGauge",0},
{ "_class_wxCheckListBox","_wxCheckListBox",0},
@@ -2070,6 +2074,8 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxTE_READONLY", PyInt_FromLong((long) wxTE_READONLY));
PyDict_SetItemString(d,"wxTE_RICH", PyInt_FromLong((long) wxTE_RICH));
PyDict_SetItemString(d,"wxTE_MULTILINE", PyInt_FromLong((long) wxTE_MULTILINE));
PyDict_SetItemString(d,"wxTE_AUTO_SCROLL", PyInt_FromLong((long) wxTE_AUTO_SCROLL));
PyDict_SetItemString(d,"wxTE_NO_VSCROLL", PyInt_FromLong((long) wxTE_NO_VSCROLL));
PyDict_SetItemString(d,"wxCB_SIMPLE", PyInt_FromLong((long) wxCB_SIMPLE));
PyDict_SetItemString(d,"wxCB_DROPDOWN", PyInt_FromLong((long) wxCB_DROPDOWN));
PyDict_SetItemString(d,"wxCB_SORT", PyInt_FromLong((long) wxCB_SORT));
+2
View File
@@ -230,6 +230,8 @@ wxTE_PASSWORD = wxc.wxTE_PASSWORD
wxTE_READONLY = wxc.wxTE_READONLY
wxTE_RICH = wxc.wxTE_RICH
wxTE_MULTILINE = wxc.wxTE_MULTILINE
wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL
wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL
wxCB_SIMPLE = wxc.wxCB_SIMPLE
wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
wxCB_SORT = wxc.wxCB_SORT
+2
View File
@@ -167,7 +167,9 @@ void wxDisplaySize(int *OUTPUT, int *OUTPUT);
void wxEndBusyCursor();
long wxExecute(const wxString& command, bool sync = FALSE);
long wxGetElapsedTime(bool resetTimer = TRUE);
#ifdef __WXMSW__
long wxGetFreeMemory();
#endif
void wxGetMousePosition(int* OUTPUT, int* OUTPUT);
bool wxIsBusy();
wxString wxNow();