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

A bunch of little tweaks, fixes, and additions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-03-13 23:50:43 +00:00
parent fe2e43661e
commit 83b18bab39
19 changed files with 161 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wxPython/contrib/stc/stc_.cpp
View File

@@ -36,10 +36,12 @@
# define SWIGEXPORT(a) a
#endif
#include "Python.h"
#ifdef __cplusplus
extern "C" {
#endif
#include "Python.h"
extern void SWIG_MakePtr(char *, void *, char *);
extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
extern char *SWIG_GetPtr(char *, void **, char *);
@@ -8626,13 +8628,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPNMHandler","_class_wxPNMHandler",0},
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
{ "_wxLogGui","_class_wxLogGui",0},
{ "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_class_wxMenuItem","_wxMenuItem",0},
{ "_class_wxPaintEvent","_wxPaintEvent",0},
{ "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
{ "_class_wxStatusBar","_wxStatusBar",0},
{ "_class_wxGIFHandler","_wxGIFHandler",0},
{ "_class_wxPySizer","_wxPySizer",0},
{ "_class_wxPostScriptDC","_wxPostScriptDC",0},
{ "_wxPanel","_class_wxPanel",0},
{ "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
{ "_wxCheckBox","_class_wxCheckBox",0},
@@ -8699,6 +8701,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxZipFSHandler","_wxZipFSHandler",0},
{ "_char","_wxChar",0},
{ "_wxBitmap","_class_wxBitmap",0},
{ "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
{ "_wxPrintDialog","_class_wxPrintDialog",0},
{ "_wxWindowDC","_class_wxWindowDC",0},
{ "_wxTimerEvent","_class_wxTimerEvent",0},
@@ -8782,6 +8785,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxTextCtrl","_wxTextCtrl",0},
{ "_class_wxListItemAttr","_wxListItemAttr",0},
{ "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
{ "_wxMetaFileDC","_class_wxMetaFileDC",0},
{ "_class_wxTextDataObject","_wxTextDataObject",0},
{ "_wxMenu","_class_wxMenu",0},
{ "_class_wxMoveEvent","_wxMoveEvent",0},
@@ -8819,6 +8823,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxBusyInfo","_class_wxBusyInfo",0},
{ "_class_wxMenuEvent","_wxMenuEvent",0},
{ "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
{ "_wxJoystick","_class_wxJoystick",0},
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
@@ -8834,6 +8839,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_signed_short","_short",0},
{ "_wxMemoryDC","_class_wxMemoryDC",0},
{ "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
{ "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
{ "_class_wxPrintDialog","_wxPrintDialog",0},
{ "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0},
{ "_wxPaintDC","_class_wxPaintDC",0},
@@ -8843,7 +8849,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxStatusBar","_class_wxStatusBar",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_wxPostScriptDC","_class_wxPostScriptDC",0},
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
{ "_class_wxPyProcess","_wxPyProcess",0},
{ "_class_wxImageHandler","_wxImageHandler",0},
@@ -8851,6 +8856,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxLog","_wxLog",0},
{ "_wxTreeItemId","_class_wxTreeItemId",0},
{ "_unsigned_char","_byte",0},
{ "_class_wxMetaFileDC","_wxMetaFileDC",0},
{ "_class_wxMenu","_wxMenu",0},
{ "_wxControl","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl},
{ "_wxControl","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl},
@@ -8943,6 +8949,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxLogGui","_wxLogGui",0},
{ "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
{ "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
{ "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
{ "_class_wxTimeSpan","_wxTimeSpan",0},
{ "_class_wxPyFileSystemHandler","_wxPyFileSystemHandler",0},
@@ -9000,6 +9007,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxGauge","_class_wxGauge",0},
{ "_class_wxCheckListBox","_wxCheckListBox",0},
{ "_class_wxBusyInfo","_wxBusyInfo",0},
{ "_class_wxJoystick","_wxJoystick",0},
{ "_class_wxCommandEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent},
{ "_class_wxCommandEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent},
{ "_class_wxCommandEvent","_wxCommandEvent",0},

2
wxPython/demo/wxStyledTextCtrl_2.py
View File

@@ -267,7 +267,7 @@ def runTest(frame, nb, log):
ed.SetText(demoText + open('Main.py').read())
ed.EmptyUndoBuffer()
ed.Colourise(0, -1)
# line numbers in the margin
ed.SetMarginType(1, wxSTC_MARGIN_NUMBER)

2
wxPython/src/_defs.i
View File

@@ -924,6 +924,8 @@ enum wxEventType {
wxEVT_TIMER,
wxWS_EX_VALIDATE_RECURSIVELY,
};

74
wxPython/src/_extras.py
View File

@@ -29,38 +29,6 @@ def _checkForCallback(obj, name, event, theID=-1):
except: pass
else: obj.Connect(theID, -1, event, cb)
## def _StdWindowCallbacks(win):
## _checkForCallback(win, "OnChar", wxEVT_CHAR)
## _checkForCallback(win, "OnSize", wxEVT_SIZE)
## _checkForCallback(win, "OnEraseBackground", wxEVT_ERASE_BACKGROUND)
## _checkForCallback(win, "OnSysColourChanged", wxEVT_SYS_COLOUR_CHANGED)
## _checkForCallback(win, "OnInitDialog", wxEVT_INIT_DIALOG)
## _checkForCallback(win, "OnPaint", wxEVT_PAINT)
## _checkForCallback(win, "OnIdle", wxEVT_IDLE)
## def _StdFrameCallbacks(win):
## _StdWindowCallbacks(win)
## _checkForCallback(win, "OnActivate", wxEVT_ACTIVATE)
## _checkForCallback(win, "OnMenuHighlight", wxEVT_MENU_HIGHLIGHT)
## _checkForCallback(win, "OnCloseWindow", wxEVT_CLOSE_WINDOW)
## def _StdDialogCallbacks(win):
## _StdWindowCallbacks(win)
## _checkForCallback(win, "OnOk", wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK)
## _checkForCallback(win, "OnApply", wxEVT_COMMAND_BUTTON_CLICKED, wxID_APPLY)
## _checkForCallback(win, "OnCancel", wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL)
## _checkForCallback(win, "OnCloseWindow", wxEVT_CLOSE_WINDOW)
## _checkForCallback(win, "OnCharHook", wxEVT_CHAR_HOOK)
## def _StdOnScrollCallbacks(win):
## try: cb = getattr(win, "OnScroll")
## except: pass
## else: EVT_SCROLL(win, cb)
#----------------------------------------------------------------------
#----------------------------------------------------------------------
@@ -557,35 +525,6 @@ def EVT_TASKBAR_RIGHT_DCLICK(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func)
## # wxGrid *** THE OLD ONE ***
## def EVT_GRID_SELECT_CELL(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
## def EVT_GRID_CREATE_CELL(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CREATE_CELL, fn)
## def EVT_GRID_CHANGE_LABELS(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CHANGE_LABELS, fn)
## def EVT_GRID_CHANGE_SEL_LABEL(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CHANGE_SEL_LABEL, fn)
## def EVT_GRID_CELL_CHANGE(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn)
## def EVT_GRID_CELL_LCLICK(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CELL_LCLICK, fn)
## def EVT_GRID_CELL_RCLICK(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CELL_RCLICK, fn)
## def EVT_GRID_LABEL_LCLICK(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_LABEL_LCLICK, fn)
## def EVT_GRID_LABEL_RCLICK(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn)
# wxSashWindow
def EVT_SASH_DRAGGED(win, id, func):
win.Connect(id, -1, wxEVT_SASH_DRAGGED, func)
@@ -725,10 +664,6 @@ NULL = _NullObj()
wxColor = wxColour
wxNamedColor = wxNamedColour
# aliases so that C++ documentation applies:
#wxDefaultPosition = wxPyDefaultPosition
#wxDefaultSize = wxPyDefaultSize
# backwards compatibility
wxNoRefBitmap = wxBitmap
@@ -757,6 +692,8 @@ wxPyDefaultSize = wxDefaultSize
#
def wxPyTypeCast(obj, typeStr):
if obj is None:
return None
if hasattr(obj, "this"):
newPtr = ptrcast(obj.this, typeStr+"_p")
else:
@@ -861,8 +798,8 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
class wxPySimpleApp(wxApp):
def __init__(self):
wxApp.__init__(self, 0)
def __init__(self, flag=0):
wxApp.__init__(self, flag)
def OnInit(self):
return true
@@ -895,6 +832,3 @@ class __wxPyCleanup:
__cleanMeUp = __wxPyCleanup()
#----------------------------------------------------------------------------

3
wxPython/src/events.i
View File

@@ -30,6 +30,9 @@
//---------------------------------------------------------------------------
int wxNewEventType();
class wxEvent {
public:
wxEvent(int id = 0);

2
wxPython/src/helpers.cpp
View File

@@ -158,7 +158,7 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
if (!PyArg_ParseTuple(args, "O", &onInitFunc))
return NULL;
#if 0 // Try it out without this check, soo how it does...
#if 0 // Try it out without this check, see how it does...
if (wxTopLevelWindows.Number() > 0) {
PyErr_SetString(PyExc_TypeError, "Only 1 wxApp per process!");
return NULL;

2
wxPython/src/misc.i
View File

@@ -312,6 +312,7 @@ long wxNewId();
void wxRegisterId(long id);
%name(NewId) long wxNewId();
%name(RegisterId) void wxRegisterId(long id);
long wxGetCurrentId();
void wxBell();
void wxDisplaySize(int *OUTPUT, int *OUTPUT);
@@ -332,6 +333,7 @@ wxString wxGetOsDescription();
void wxSleep(int secs);
void wxUsleep(unsigned long milliseconds);
bool wxYield();
bool wxYieldIfNeeded();
void wxEnableTopLevelWindows(bool enable);
%inline %{

18
wxPython/src/msw/events.cpp
View File

@@ -108,6 +108,23 @@ static char* wxStringErrorMsg = "string type is required for parameter";
#ifdef __cplusplus
extern "C" {
#endif
static PyObject *_wrap_wxNewEventType(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxNewEventType",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (int )wxNewEventType();
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define new_wxEvent(_swigarg0) (new wxEvent(_swigarg0))
static PyObject *_wrap_new_wxEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -6282,6 +6299,7 @@ static PyMethodDef eventscMethods[] = {
{ "wxEvent_GetEventObject", (PyCFunction) _wrap_wxEvent_GetEventObject, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxEvent", (PyCFunction) _wrap_delete_wxEvent, METH_VARARGS | METH_KEYWORDS },
{ "new_wxEvent", (PyCFunction) _wrap_new_wxEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxNewEventType", (PyCFunction) _wrap_wxNewEventType, METH_VARARGS | METH_KEYWORDS },
{ NULL, NULL }
};
#ifdef __cplusplus

2
wxPython/src/msw/events.py
View File

@@ -972,6 +972,8 @@ class wxPyCommandEvent(wxPyCommandEventPtr):
#-------------- FUNCTION WRAPPERS ------------------
wxNewEventType = eventsc.wxNewEventType
#-------------- VARIABLE WRAPPERS ------------------

36
wxPython/src/msw/misc.cpp
View File

@@ -252,6 +252,23 @@ static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args, PyObject *kwar
return _resultobj;
}
static PyObject *_wrap_wxGetCurrentId(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
long _result;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetCurrentId",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (long )wxGetCurrentId();
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("l",_result);
return _resultobj;
}
static PyObject *_wrap_wxBell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
char *_kwnames[] = { NULL };
@@ -607,6 +624,23 @@ static PyObject *_wrap_wxYield(PyObject *self, PyObject *args, PyObject *kwargs)
return _resultobj;
}
static PyObject *_wrap_wxYieldIfNeeded(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxYieldIfNeeded",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (bool )wxYieldIfNeeded();
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static PyObject *_wrap_wxEnableTopLevelWindows(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _arg0;
@@ -4972,6 +5006,7 @@ static PyMethodDef misccMethods[] = {
{ "wxStripMenuCodes", (PyCFunction) _wrap_wxStripMenuCodes, METH_VARARGS | METH_KEYWORDS },
{ "wxGetResource", (PyCFunction) _wrap_wxGetResource, METH_VARARGS | METH_KEYWORDS },
{ "wxEnableTopLevelWindows", (PyCFunction) _wrap_wxEnableTopLevelWindows, METH_VARARGS | METH_KEYWORDS },
{ "wxYieldIfNeeded", (PyCFunction) _wrap_wxYieldIfNeeded, METH_VARARGS | METH_KEYWORDS },
{ "wxYield", (PyCFunction) _wrap_wxYield, METH_VARARGS | METH_KEYWORDS },
{ "wxUsleep", (PyCFunction) _wrap_wxUsleep, METH_VARARGS | METH_KEYWORDS },
{ "wxSleep", (PyCFunction) _wrap_wxSleep, METH_VARARGS | METH_KEYWORDS },
@@ -4987,6 +5022,7 @@ static PyMethodDef misccMethods[] = {
{ "wxEndBusyCursor", (PyCFunction) _wrap_wxEndBusyCursor, METH_VARARGS | METH_KEYWORDS },
{ "wxDisplaySize", (PyCFunction) _wrap_wxDisplaySize, METH_VARARGS | METH_KEYWORDS },
{ "wxBell", (PyCFunction) _wrap_wxBell, METH_VARARGS | METH_KEYWORDS },
{ "wxGetCurrentId", (PyCFunction) _wrap_wxGetCurrentId, METH_VARARGS | METH_KEYWORDS },
{ "RegisterId", (PyCFunction) _wrap_RegisterId, METH_VARARGS | METH_KEYWORDS },
{ "NewId", (PyCFunction) _wrap_NewId, METH_VARARGS | METH_KEYWORDS },
{ "wxRegisterId", (PyCFunction) _wrap_wxRegisterId, METH_VARARGS | METH_KEYWORDS },

4
wxPython/src/msw/misc.py
View File

@@ -654,6 +654,8 @@ NewId = miscc.NewId
RegisterId = miscc.RegisterId
wxGetCurrentId = miscc.wxGetCurrentId
wxBell = miscc.wxBell
wxDisplaySize = miscc.wxDisplaySize
@@ -684,6 +686,8 @@ wxUsleep = miscc.wxUsleep
wxYield = miscc.wxYield
wxYieldIfNeeded = miscc.wxYieldIfNeeded
wxEnableTopLevelWindows = miscc.wxEnableTopLevelWindows
wxGetResource = miscc.wxGetResource

30
wxPython/src/msw/stattool.cpp
View File

@@ -2667,6 +2667,35 @@ static PyObject *_wrap_wxToolBarBase_GetToolMargins(PyObject *self, PyObject *ar
return _resultobj;
}
#define wxToolBarBase_GetMargins(_swigobj) (_swigobj->GetMargins())
static PyObject *_wrap_wxToolBarBase_GetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSize * _result;
wxToolBarBase * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarBase_GetMargins",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetMargins. Expected _wxToolBarBase_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxSize (wxToolBarBase_GetMargins(_arg0));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxToolBarBase_GetToolPacking(_swigobj) (_swigobj->GetToolPacking())
static PyObject *_wrap_wxToolBarBase_GetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3185,6 +3214,7 @@ static PyMethodDef stattoolcMethods[] = {
{ "wxToolBarBase_SetRows", (PyCFunction) _wrap_wxToolBarBase_SetRows, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_GetToolSeparation", (PyCFunction) _wrap_wxToolBarBase_GetToolSeparation, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_GetToolPacking", (PyCFunction) _wrap_wxToolBarBase_GetToolPacking, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_GetMargins", (PyCFunction) _wrap_wxToolBarBase_GetMargins, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_GetToolMargins", (PyCFunction) _wrap_wxToolBarBase_GetToolMargins, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_SetToolSeparation", (PyCFunction) _wrap_wxToolBarBase_SetToolSeparation, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_SetToolPacking", (PyCFunction) _wrap_wxToolBarBase_SetToolPacking, METH_VARARGS | METH_KEYWORDS },

4
wxPython/src/msw/stattool.py
View File

@@ -256,6 +256,10 @@ class wxToolBarBasePtr(wxControlPtr):
val = apply(stattoolc.wxToolBarBase_GetToolMargins,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
return val
def GetMargins(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetMargins,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
return val
def GetToolPacking(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolPacking,(self,) + _args, _kwargs)
return val

29
wxPython/src/msw/windows.cpp
View File

@@ -4393,6 +4393,34 @@ static PyObject *_wrap_wxWindow_SetEventHandler(PyObject *self, PyObject *args,
return _resultobj;
}
#define wxWindow_SetExtraStyle(_swigobj,_swigarg0) (_swigobj->SetExtraStyle(_swigarg0))
static PyObject *_wrap_wxWindow_SetExtraStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxWindow * _arg0;
long _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","exStyle", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxWindow_SetExtraStyle",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetExtraStyle. Expected _wxWindow_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxWindow_SetExtraStyle(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxWindow_SetTitle(_swigobj,_swigarg0) (_swigobj->SetTitle(_swigarg0))
static PyObject *_wrap_wxWindow_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -9646,6 +9674,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_TransferDataFromWindow", (PyCFunction) _wrap_wxWindow_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_Show", (PyCFunction) _wrap_wxWindow_Show, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetTitle", (PyCFunction) _wrap_wxWindow_SetTitle, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetExtraStyle", (PyCFunction) _wrap_wxWindow_SetExtraStyle, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetEventHandler", (PyCFunction) _wrap_wxWindow_SetEventHandler, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetCursor", (PyCFunction) _wrap_wxWindow_SetCursor, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetClientSize", (PyCFunction) _wrap_wxWindow_SetClientSize, METH_VARARGS | METH_KEYWORDS },

3
wxPython/src/msw/windows.py
View File

@@ -433,6 +433,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
def SetEventHandler(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_SetEventHandler,(self,) + _args, _kwargs)
return val
def SetExtraStyle(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_SetExtraStyle,(self,) + _args, _kwargs)
return val
def SetTitle(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_SetTitle,(self,) + _args, _kwargs)
return val

1
wxPython/src/msw/wx.cpp
View File

@@ -2961,6 +2961,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxEVT_COMMAND_ENTER", PyInt_FromLong((long) wxEVT_COMMAND_ENTER));
PyDict_SetItemString(d,"wxEVT_NAVIGATION_KEY", PyInt_FromLong((long) wxEVT_NAVIGATION_KEY));
PyDict_SetItemString(d,"wxEVT_TIMER", PyInt_FromLong((long) wxEVT_TIMER));
PyDict_SetItemString(d,"wxWS_EX_VALIDATE_RECURSIVELY", PyInt_FromLong((long) wxWS_EX_VALIDATE_RECURSIVELY));
PyDict_SetItemString(d,"__version__", PyString_FromString("0.0.0"));
PyDict_SetItemString(d,"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,"wxDefaultPosition",_wrap_wxDefaultPosition_get, _wrap_wxDefaultPosition_set);

75
wxPython/src/msw/wx.py
View File

@@ -810,6 +810,7 @@ wxEVT_COMMAND_KILL_FOCUS = wxc.wxEVT_COMMAND_KILL_FOCUS
wxEVT_COMMAND_ENTER = wxc.wxEVT_COMMAND_ENTER
wxEVT_NAVIGATION_KEY = wxc.wxEVT_NAVIGATION_KEY
wxEVT_TIMER = wxc.wxEVT_TIMER
wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY
__version__ = wxc.__version__
cvar = wxc.cvar
wxDefaultPosition = wxPointPtr(wxc.cvar.wxDefaultPosition)
@@ -849,38 +850,6 @@ def _checkForCallback(obj, name, event, theID=-1):
except: pass
else: obj.Connect(theID, -1, event, cb)
## def _StdWindowCallbacks(win):
## _checkForCallback(win, "OnChar", wxEVT_CHAR)
## _checkForCallback(win, "OnSize", wxEVT_SIZE)
## _checkForCallback(win, "OnEraseBackground", wxEVT_ERASE_BACKGROUND)
## _checkForCallback(win, "OnSysColourChanged", wxEVT_SYS_COLOUR_CHANGED)
## _checkForCallback(win, "OnInitDialog", wxEVT_INIT_DIALOG)
## _checkForCallback(win, "OnPaint", wxEVT_PAINT)
## _checkForCallback(win, "OnIdle", wxEVT_IDLE)
## def _StdFrameCallbacks(win):
## _StdWindowCallbacks(win)
## _checkForCallback(win, "OnActivate", wxEVT_ACTIVATE)
## _checkForCallback(win, "OnMenuHighlight", wxEVT_MENU_HIGHLIGHT)
## _checkForCallback(win, "OnCloseWindow", wxEVT_CLOSE_WINDOW)
## def _StdDialogCallbacks(win):
## _StdWindowCallbacks(win)
## _checkForCallback(win, "OnOk", wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK)
## _checkForCallback(win, "OnApply", wxEVT_COMMAND_BUTTON_CLICKED, wxID_APPLY)
## _checkForCallback(win, "OnCancel", wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL)
## _checkForCallback(win, "OnCloseWindow", wxEVT_CLOSE_WINDOW)
## _checkForCallback(win, "OnCharHook", wxEVT_CHAR_HOOK)
## def _StdOnScrollCallbacks(win):
## try: cb = getattr(win, "OnScroll")
## except: pass
## else: EVT_SCROLL(win, cb)
#----------------------------------------------------------------------
#----------------------------------------------------------------------
@@ -1377,35 +1346,6 @@ def EVT_TASKBAR_RIGHT_DCLICK(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func)
## # wxGrid *** THE OLD ONE ***
## def EVT_GRID_SELECT_CELL(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
## def EVT_GRID_CREATE_CELL(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CREATE_CELL, fn)
## def EVT_GRID_CHANGE_LABELS(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CHANGE_LABELS, fn)
## def EVT_GRID_CHANGE_SEL_LABEL(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CHANGE_SEL_LABEL, fn)
## def EVT_GRID_CELL_CHANGE(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn)
## def EVT_GRID_CELL_LCLICK(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CELL_LCLICK, fn)
## def EVT_GRID_CELL_RCLICK(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_CELL_RCLICK, fn)
## def EVT_GRID_LABEL_LCLICK(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_LABEL_LCLICK, fn)
## def EVT_GRID_LABEL_RCLICK(win, fn):
## win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn)
# wxSashWindow
def EVT_SASH_DRAGGED(win, id, func):
win.Connect(id, -1, wxEVT_SASH_DRAGGED, func)
@@ -1545,10 +1485,6 @@ NULL = _NullObj()
wxColor = wxColour
wxNamedColor = wxNamedColour
# aliases so that C++ documentation applies:
#wxDefaultPosition = wxPyDefaultPosition
#wxDefaultSize = wxPyDefaultSize
# backwards compatibility
wxNoRefBitmap = wxBitmap
@@ -1577,6 +1513,8 @@ wxPyDefaultSize = wxDefaultSize
#
def wxPyTypeCast(obj, typeStr):
if obj is None:
return None
if hasattr(obj, "this"):
newPtr = ptrcast(obj.this, typeStr+"_p")
else:
@@ -1681,8 +1619,8 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
class wxPySimpleApp(wxApp):
def __init__(self):
wxApp.__init__(self, 0)
def __init__(self, flag=0):
wxApp.__init__(self, flag)
def OnInit(self):
return true
@@ -1715,6 +1653,3 @@ class __wxPyCleanup:
__cleanMeUp = __wxPyCleanup()
#----------------------------------------------------------------------------

1
wxPython/src/stattool.i
View File

@@ -257,6 +257,7 @@ public:
void SetToolPacking(int packing);
void SetToolSeparation(int separation);
wxSize GetToolMargins();
wxSize GetMargins();
int GetToolPacking();
int GetToolSeparation();

1
wxPython/src/windows.i
View File

@@ -348,6 +348,7 @@ public:
//void SetPalette(wxPalette* palette);
void SetCursor(const wxCursor&cursor);
void SetEventHandler(wxEvtHandler* handler);
void SetExtraStyle(long exStyle);
void SetTitle(const wxString& title);
bool Show(bool show);
bool TransferDataFromWindow();