Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct DLL import/export specifier for multi-lib builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-05-18 01:22:06 +00:00
parent e328812d74
commit f460c29d59
37 changed files with 3885 additions and 3429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/contrib/activex/activex.py
View File

@@ -354,7 +354,7 @@ ActiveXWindow_swigregister(ActiveXWindow)
def RegisterActiveXEvent(*args, **kwargs):
"""
RegisterActiveXEvent(String eventName) -> wxEventType
RegisterActiveXEvent(String eventName) -> EventType
Creates a standard wx event ID for the given eventName.
"""

2
wxPython/contrib/activex/activex_wrap.cpp
View File

@@ -5664,7 +5664,7 @@ SWIGINTERN PyObject *_wrap_IEHtmlWindowBase_LoadStream(PyObject *SWIGUNUSEDPARM(
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "_is", NULL
(char *) "self",(char *) "is", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IEHtmlWindowBase_LoadStream",kwnames,&obj0,&obj1)) SWIG_fail;

2
wxPython/contrib/gizmos/msw/gizmos.py
View File

@@ -357,6 +357,8 @@ class TreeListColumnInfo(_core.Object):
bool shown=True, int alignment=TL_ALIGN_LEFT) -> TreeListColumnInfo
"""
_gizmos.TreeListColumnInfo_swiginit(self,_gizmos.new_TreeListColumnInfo(*args, **kwargs))
__swig_destroy__ = _gizmos.delete_TreeListColumnInfo
__del__ = lambda self : None;
def GetShown(*args, **kwargs):
"""GetShown(self) -> bool"""
return _gizmos.TreeListColumnInfo_GetShown(*args, **kwargs)

65
wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
View File

@@ -5137,6 +5137,34 @@ fail:
}
SWIGINTERN PyObject *_wrap_delete_TreeListColumnInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 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_wxTreeListColumnInfo, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TreeListColumnInfo" "', expected argument " "1"" of type '" "wxTreeListColumnInfo *""'");
}
arg1 = reinterpret_cast< wxTreeListColumnInfo * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_TreeListColumnInfo_GetShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
@@ -7482,7 +7510,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemData(PyObject *SWIGUNUSEDPARM(sel
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
void *argp3 = 0 ;
int res3 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -7505,11 +7532,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_SetItemData(PyObject *SWIGUNUSEDPARM(sel
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TreeListCtrl_SetItemData" "', expected argument " "2"" of type '" "wxTreeItemId const &""'");
}
arg2 = reinterpret_cast< wxTreeItemId * >(argp2);
res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxPyTreeItemData, 0 | 0 );
res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&arg3), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res3)) {
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetItemData" "', expected argument " "3"" of type '" "wxPyTreeItemData *""'");
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TreeListCtrl_SetItemData" "', expected argument " "3"" of type '" "wxPyTreeItemData *""'");
}
arg3 = reinterpret_cast< wxPyTreeItemData * >(argp3);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyTreeListCtrl_SetItemData(arg1,(wxTreeItemId const &)*arg2,arg3);
@@ -8817,7 +8843,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *SWIGUNUSEDPARM(self),
int ecode3 = 0 ;
int val4 ;
int ecode4 = 0 ;
void *argp5 = 0 ;
int res5 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -8854,11 +8879,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *SWIGUNUSEDPARM(self),
arg4 = static_cast< int >(val4);
}
if (obj4) {
res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_wxPyTreeItemData, 0 | 0 );
res5 = SWIG_ConvertPtr(obj4, SWIG_as_voidptrptr(&arg5), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res5)) {
SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "TreeListCtrl_AddRoot" "', expected argument " "5"" of type '" "wxPyTreeItemData *""'");
SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "TreeListCtrl_AddRoot" "', expected argument " "5"" of type '" "wxPyTreeItemData *""'");
}
arg5 = reinterpret_cast< wxPyTreeItemData * >(argp5);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8899,7 +8923,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *SWIGUNUSEDPARM(sel
int ecode4 = 0 ;
int val5 ;
int ecode5 = 0 ;
void *argp6 = 0 ;
int res6 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -8945,11 +8968,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *SWIGUNUSEDPARM(sel
arg5 = static_cast< int >(val5);
}
if (obj5) {
res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_wxPyTreeItemData, 0 | 0 );
res6 = SWIG_ConvertPtr(obj5, SWIG_as_voidptrptr(&arg6), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res6)) {
SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "TreeListCtrl_PrependItem" "', expected argument " "6"" of type '" "wxPyTreeItemData *""'");
SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "TreeListCtrl_PrependItem" "', expected argument " "6"" of type '" "wxPyTreeItemData *""'");
}
arg6 = reinterpret_cast< wxPyTreeItemData * >(argp6);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8993,7 +9015,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *SWIGUNUSEDPARM(self
int ecode5 = 0 ;
int val6 ;
int ecode6 = 0 ;
void *argp7 = 0 ;
int res7 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -9048,11 +9069,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *SWIGUNUSEDPARM(self
arg6 = static_cast< int >(val6);
}
if (obj6) {
res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxPyTreeItemData, 0 | 0 );
res7 = SWIG_ConvertPtr(obj6, SWIG_as_voidptrptr(&arg7), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res7)) {
SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TreeListCtrl_InsertItem" "', expected argument " "7"" of type '" "wxPyTreeItemData *""'");
SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TreeListCtrl_InsertItem" "', expected argument " "7"" of type '" "wxPyTreeItemData *""'");
}
arg7 = reinterpret_cast< wxPyTreeItemData * >(argp7);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9096,7 +9116,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *SWIGUNUSEDPAR
int ecode5 = 0 ;
int val6 ;
int ecode6 = 0 ;
void *argp7 = 0 ;
int res7 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -9148,11 +9167,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *SWIGUNUSEDPAR
arg6 = static_cast< int >(val6);
}
if (obj6) {
res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxPyTreeItemData, 0 | 0 );
res7 = SWIG_ConvertPtr(obj6, SWIG_as_voidptrptr(&arg7), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res7)) {
SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TreeListCtrl_InsertItemBefore" "', expected argument " "7"" of type '" "wxPyTreeItemData *""'");
SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "TreeListCtrl_InsertItemBefore" "', expected argument " "7"" of type '" "wxPyTreeItemData *""'");
}
arg7 = reinterpret_cast< wxPyTreeItemData * >(argp7);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9193,7 +9211,6 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *SWIGUNUSEDPARM(self
int ecode4 = 0 ;
int val5 ;
int ecode5 = 0 ;
void *argp6 = 0 ;
int res6 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -9239,11 +9256,10 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *SWIGUNUSEDPARM(self
arg5 = static_cast< int >(val5);
}
if (obj5) {
res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_wxPyTreeItemData, 0 | 0 );
res6 = SWIG_ConvertPtr(obj5, SWIG_as_voidptrptr(&arg6), SWIGTYPE_p_wxPyTreeItemData, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res6)) {
SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "TreeListCtrl_AppendItem" "', expected argument " "6"" of type '" "wxPyTreeItemData *""'");
SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "TreeListCtrl_AppendItem" "', expected argument " "6"" of type '" "wxPyTreeItemData *""'");
}
arg6 = reinterpret_cast< wxPyTreeItemData * >(argp6);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10868,6 +10884,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"LEDNumberCtrl_swigregister", LEDNumberCtrl_swigregister, METH_VARARGS, NULL},
{ (char *)"LEDNumberCtrl_swiginit", LEDNumberCtrl_swiginit, METH_VARARGS, NULL},
{ (char *)"new_TreeListColumnInfo", (PyCFunction) _wrap_new_TreeListColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"delete_TreeListColumnInfo", (PyCFunction)_wrap_delete_TreeListColumnInfo, METH_O, NULL},
{ (char *)"TreeListColumnInfo_GetShown", (PyCFunction)_wrap_TreeListColumnInfo_GetShown, METH_O, NULL},
{ (char *)"TreeListColumnInfo_GetAlignment", (PyCFunction)_wrap_TreeListColumnInfo_GetAlignment, METH_O, NULL},
{ (char *)"TreeListColumnInfo_GetText", (PyCFunction)_wrap_TreeListColumnInfo_GetText, METH_O, NULL},

12
wxPython/contrib/glcanvas/msw/glcanvas.py
View File

@@ -64,7 +64,7 @@ class GLContext(_core.Object):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, bool isRGB, GLCanvas win, wxPalette palette=wxNullPalette,
__init__(self, bool isRGB, GLCanvas win, Palette palette=wxNullPalette,
GLContext other=None) -> GLContext
"""
_glcanvas.GLContext_swiginit(self,_glcanvas.new_GLContext(*args, **kwargs))
@@ -115,7 +115,7 @@ class GLCanvas(_core.Window):
"""
__init__(self, Window parent, int id=-1, Point pos=DefaultPosition,
Size size=DefaultSize, long style=0, String name=GLCanvasNameStr,
int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas
int attribList=None, Palette palette=wxNullPalette) -> GLCanvas
"""
_glcanvas.GLCanvas_swiginit(self,_glcanvas.new_GLCanvas(*args, **kwargs))
self._setOORInfo(self)
@@ -141,15 +141,15 @@ class GLCanvas(_core.Window):
return _glcanvas.GLCanvas_SetupPixelFormat(*args, **kwargs)
def SetupPalette(*args, **kwargs):
"""SetupPalette(self, wxPalette palette)"""
"""SetupPalette(self, Palette palette)"""
return _glcanvas.GLCanvas_SetupPalette(*args, **kwargs)
def CreateDefaultPalette(*args, **kwargs):
"""CreateDefaultPalette(self) -> wxPalette"""
"""CreateDefaultPalette(self) -> Palette"""
return _glcanvas.GLCanvas_CreateDefaultPalette(*args, **kwargs)
def GetPalette(*args, **kwargs):
"""GetPalette(self) -> wxPalette"""
"""GetPalette(self) -> Palette"""
return _glcanvas.GLCanvas_GetPalette(*args, **kwargs)
GLCanvas_swigregister = _glcanvas.GLCanvas_swigregister
@@ -160,7 +160,7 @@ def GLCanvasWithContext(*args, **kwargs):
GLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition,
Size size=DefaultSize,
long style=0, String name=GLCanvasNameStr,
int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas
int attribList=None, Palette palette=wxNullPalette) -> GLCanvas
"""
val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs)
val._setOORInfo(val)

2
wxPython/contrib/stc/msw/stc.py
View File

@@ -5176,7 +5176,7 @@ class StyledTextEvent(_core.CommandEvent):
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, wxEventType commandType=0, int id=0) -> StyledTextEvent"""
"""__init__(self, EventType commandType=0, int id=0) -> StyledTextEvent"""
_stc.StyledTextEvent_swiginit(self,_stc.new_StyledTextEvent(*args, **kwargs))
__swig_destroy__ = _stc.delete_StyledTextEvent
__del__ = lambda self : None;

2
wxPython/contrib/stc/msw/stc_wrap.cpp
View File

@@ -18906,7 +18906,7 @@ SWIGINTERN PyObject *_wrap_StyledTextCtrl_DoDragOver(PyObject *SWIGUNUSEDPARM(se
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "x",(char *) "y",(char *) "_def", NULL
(char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:StyledTextCtrl_DoDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;