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

Added wxGenericDirCtrl and other varioius updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-01-15 04:54:19 +00:00
parent c7206e6424
commit 68320e40cd
28 changed files with 2280 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wxPython/CHANGES.txt
View File

@@ -4,14 +4,15 @@ CHANGES.txt for wxPython
2.3.3
-----
Added wxSplashScreen.
Added wxGenericDirCtrl.
2.3.2.1
-------
Changed (again) how the Python global interpreter lock is handled as
well as the Python thread state. This time it works on SMP machines
without barfing and is also still compatible with Python debuggers.

38
wxPython/contrib/ogl/oglbasic.cpp
View File

@@ -3801,14 +3801,20 @@ static PyObject *_wrap_wxPyShape_GetFixedSize(PyObject *self, PyObject *args, Py
PyObject * _resultobj;
wxPyShape * _arg0;
bool * _arg1;
int temp;
bool * _arg2;
int temp0;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
PyObject * _argo2 = 0;
char *_kwnames[] = { "self","OUTPUT","OUTPUT", NULL };
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPyShape_GetFixedSize",_kwnames,&_argo0,&_argo1,&_argo2))
{
_arg1 = (bool*)&temp;
}
{
_arg2 = (bool*)&temp0;
}
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyShape_GetFixedSize",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3817,20 +3823,6 @@ static PyObject *_wrap_wxPyShape_GetFixedSize(PyObject *self, PyObject *args, Py
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_bool_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyShape_GetFixedSize. Expected _bool_p.");
return NULL;
}
}
if (_argo2) {
if (_argo2 == Py_None) { _arg2 = NULL; }
else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_bool_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPyShape_GetFixedSize. Expected _bool_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxPyShape_GetFixedSize(_arg0,_arg1,_arg2);
@@ -3839,6 +3831,16 @@ static PyObject *_wrap_wxPyShape_GetFixedSize(PyObject *self, PyObject *args, Py
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg1));
_resultobj = t_output_helper(_resultobj, o);
}
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg2));
_resultobj = t_output_helper(_resultobj, o);
}
return _resultobj;
}

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

@@ -11328,7 +11328,7 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_NNCRONTAB_STRING", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_NNCRONTAB_ENVIRONMENT", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_NNCRONTAB_IDENTIFIER", PyInt_FromLong((long) 10));
PyDict_SetItemString(d,"wxSTC_MASK_FOLDERS", PyInt_FromLong((long) ((1<<(30))|(1<<(31)))));
PyDict_SetItemString(d,"wxSTC_MASK_FOLDERS", PyInt_FromLong((long) ((1<<(30))|(1<<(31))|(1<<(29))|(1<<(28))|(1<<(27))|(1<<(26))|(1<<(25)))));
PyDict_SetItemString(d,"wxSTCNameStr", PyString_FromString("wxSTCNameStr"));
PyDict_SetItemString(d,"wxEVT_STC_CHANGE", PyInt_FromLong((long) wxEVT_STC_CHANGE));
PyDict_SetItemString(d,"wxEVT_STC_STYLENEEDED", PyInt_FromLong((long) wxEVT_STC_STYLENEEDED));

30
wxPython/demo/Main.py
View File

@@ -22,25 +22,7 @@ import images
_treeList = [
('New since last release', ['ContextHelp',
'PyCrust',
'PyCrustWithFilling',
'VirtualListCtrl',
'wxListCtrl',
'TablePrint',
'OOR',
'wxFindReplaceDialog',
'DrawXXXList',
'ErrorDialogs',
'wxRightTextCtrl',
'URLDragAndDrop',
'wxMimeTypesManager',
'wxPopupWindow',
'wxDynamicSashWindow',
'wxEditableListBox',
'SplitTree',
'wxLEDNumberCtrl',
'wxEditor',
('New since last release', ['wxGenericDirCtrl',
]),
('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame',
@@ -60,7 +42,8 @@ _treeList = [
]),
('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'VirtualListCtrl',
'wxTextCtrl',
'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
'wxCalendarCtrl', 'wxToggleButton',
@@ -77,7 +60,7 @@ _treeList = [
'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave",
'wxJoystick', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager',
'SplitTree',
'ContextHelp', 'SplitTree',
]),
('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
@@ -85,7 +68,8 @@ _treeList = [
'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
'FileBrowseButton', 'GenericButtons', 'wxEditor',
'ColourSelect', 'ImageBrowser',
'infoframe', 'ColourDB', 'PyCrust', 'TablePrint',
'infoframe', 'ColourDB', 'PyCrust', 'PyCrustWithFilling',
'TablePrint',
'wxRightTextCtrl',
]),
@@ -511,7 +495,7 @@ class MySplashScreen(wxSplashScreen):
class MyApp(wxApp):
def OnInit(self):
"""
Create and show the splash screen. It will then create and show
Create and show the splash screen. It will then create and show
the main frame when it is time to do so.
"""
wxInitAllImageHandlers()

6
wxPython/demo/SplitTree.py
View File

@@ -65,7 +65,7 @@ class TestPanel(wxPanel):
wxPanel.__init__(self, parent, -1)
self.log = log
scroller = wxSplitterScrolledWindow(self, -1, (50,50), (350, 250),
scroller = wxSplitterScrolledWindow(self, -1, #(50,50), (350, 250),
style=wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL)
splitter = wxThinSplitterWindow(scroller, -1, style=wxSP_3DBORDER | wxCLIP_CHILDREN)
splitter.SetSashSize(2)
@@ -83,6 +83,10 @@ class TestPanel(wxPanel):
valueWindow.SetTreeCtrl(tree)
tree.SetCompanionWindow(valueWindow)
sizer = wxBoxSizer(wxVERTICAL)
sizer.Add(scroller, 1, wxEXPAND|wxALL, 25)
self.SetAutoLayout(true)
self.SetSizer(sizer)
#----------------------------------------------------------------------

4
wxPython/demo/wxFontDialog.py
View File

@@ -5,6 +5,10 @@ from wxPython.wx import *
def runTest(frame, nb, log):
data = wxFontData()
data.EnableEffects(true)
font_colour = wxColour(255, 0, 0) # colour of font (red)
data.SetColour(font_colour) # set colour
print data.GetColour()
dlg = wxFontDialog(frame, data)
if dlg.ShowModal() == wxID_OK:
data = dlg.GetFontData()

3
wxPython/src/.cvsignore
View File

@@ -20,6 +20,9 @@ libwxPyHelpers.2.2.so.1.0.0
libwxPyHelpers.2.2.so.2.0.0
make.bat
makefile.test
mt-try1
mt-try2-works
mt-try3
sedscript
templates
tests___Win32_Debug

2
wxPython/src/_defs.i
View File

@@ -268,6 +268,7 @@ enum {
wxTE_MULTILINE,
wxTE_PROCESS_TAB,
wxTE_RICH,
wxTE_RICH2,
wxTE_NO_VSCROLL,
wxTE_AUTO_SCROLL,
wxTE_PROCESS_ENTER,
@@ -716,6 +717,7 @@ enum wxBitmapType
wxBITMAP_TYPE_PICT_RESOURCE,
wxBITMAP_TYPE_ICON,
wxBITMAP_TYPE_ICON_RESOURCE,
wxBITMAP_TYPE_ANI,
wxBITMAP_TYPE_MACCURSOR,
wxBITMAP_TYPE_MACCURSOR_RESOURCE,
wxBITMAP_TYPE_ANY = 50

11
wxPython/src/_extras.py
View File

@@ -570,12 +570,6 @@ class wxTimer(wxPyTimer):
wxPyTimer.__init__(self, None)
self.SetOwner(evtHandler, id)
#----------------------------------------------------------------------
NULL = None # For backwards compatibility only. You should really be
# using None now.
#----------------------------------------------------------------------
# aliases
@@ -587,7 +581,10 @@ wxPen = wxPyPen
wxNoRefBitmap = wxBitmap
wxPyDefaultPosition = wxDefaultPosition
wxPyDefaultSize = wxDefaultSize
NULL = None
wxSystemSettings_GetSystemColour = wxSystemSettings_GetColour
wxSystemSettings_GetSystemFont = wxSystemSettings_GetFont
wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
#----------------------------------------------------------------------
# wxGTK sets the locale when initialized. Doing this at the Python

1
wxPython/src/cmndlgs.i
View File

@@ -83,6 +83,7 @@ public:
int ShowModal();
};
//----------------------------------------------------------------------
class wxFileDialog : public wxDialog {

9
wxPython/src/controls.i
View File

@@ -30,7 +30,6 @@
#ifdef __WXGTK__
#include <wx/checklst.h>
#endif
%}
//----------------------------------------------------------------------
@@ -740,6 +739,8 @@ public:
wxString GetValue() const;
void SetValue(const wxString& value);
wxString GetRange(long from, long to);
int GetLineLength(long lineNo) const;
wxString GetLineText(long lineNo) const;
int GetNumberOfLines() const;
@@ -782,7 +783,10 @@ public:
// considering all its contents as a single strings) and (x, y) coordinates
// which represent column and line.
long XYToPosition(long x, long y) const;
bool PositionToXY(long pos, long *OUTPUT, long *OUTPUT) const;
void PositionToXY(long pos, long *OUTPUT, long *OUTPUT) const;
//bool PositionToXY(long pos, long *OUTPUT, long *OUTPUT) const;
// TODO: check return value, raise exception.
void ShowPosition(long pos);
@@ -1119,6 +1123,7 @@ public:
};
#endif
//----------------------------------------------------------------------
//----------------------------------------------------------------------
//----------------------------------------------------------------------

116
wxPython/src/controls2.i
View File

@@ -20,6 +20,7 @@
#include <wx/listctrl.h>
#include <wx/treectrl.h>
#include <wx/imaglist.h>
#include <wx/dirctrl.h>
%}
//----------------------------------------------------------------------
@@ -1281,6 +1282,121 @@ public:
//----------------------------------------------------------------------
enum {
wxDIRCTRL_DIR_ONLY,
wxDIRCTRL_SELECT_FIRST,
wxDIRCTRL_SHOW_FILTERS,
wxDIRCTRL_3D_INTERNAL,
};
class wxDirItemData : public wxObject // wxTreeItemData
{
public:
wxDirItemData(const wxString& path, const wxString& name, bool isDir);
// ~wxDirItemDataEx();
void SetNewDirName( wxString path );
wxString m_path, m_name;
bool m_isHidden;
bool m_isExpanded;
bool m_isDir;
};
class wxGenericDirCtrl: public wxControl
{
public:
wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = -1,
const wxString &dir = wxDirDialogDefaultFolderStr,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
const wxString& filter = wxEmptyString,
int defaultFilter = 0,
const wxString& name = "dirCtrl" );
%name(wxPreGenericDirCtrl)wxGenericDirCtrl();
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
%pragma(python) addtomethod = "wxPreGenericDirCtrl:val._setOORInfo(val)"
bool Create(wxWindow *parent, const wxWindowID id = -1,
const wxString &dir = wxDirDialogDefaultFolderStr,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
const wxString& filter = wxEmptyString,
int defaultFilter = 0,
const wxString& name = "treeCtrl" );
// Try to expand as much of the given path as possible.
bool ExpandPath(const wxString& path);
// Accessors
inline wxString GetDefaultPath() const;
void SetDefaultPath(const wxString& path);
// Get dir or filename
wxString GetPath() const ;
// Get selected filename path only (else empty string).
// I.e. don't count a directory as a selection
wxString GetFilePath() const ;
void SetPath(const wxString& path) ;
void ShowHidden( bool show );
bool GetShowHidden();
wxString GetFilter() const;
void SetFilter(const wxString& filter);
int GetFilterIndex() const;
void SetFilterIndex(int n) ;
wxTreeItemId GetRootId();
wxTreeCtrl* GetTreeCtrl() const;
wxDirFilterListCtrl* GetFilterListCtrl() const;
// //// Helpers
// void SetupSections();
// // Parse the filter into an array of filters and an array of descriptions
// int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions);
// // Find the child that matches the first part of 'path'.
// // E.g. if a child path is "/usr" and 'path' is "/usr/include"
// // then the child for /usr is returned.
// // If the path string has been used (we're at the leaf), done is set to TRUE
// wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done);
};
class wxDirFilterListCtrl: public wxChoice
{
public:
wxDirFilterListCtrl(wxGenericDirCtrl* parent, const wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0);
%name(wxPreDirFilterListCtrl)wxDirFilterListCtrl();
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
%pragma(python) addtomethod = "wxPreDirFilterListCtrl:val._setOORInfo(val)"
bool Create(wxGenericDirCtrl* parent, const wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0);
//// Operations
void FillFilterList(const wxString& filter, int defaultFilter);
};
//----------------------------------------------------------------------
//----------------------------------------------------------------------
%init %{
// Map renamed classes back to their common name for OOR
wxPyPtrTypeMap_Add("wxTreeItemData", "wxPyTreeItemData");

3
wxPython/src/gdi.i
View File

@@ -554,6 +554,9 @@ public:
bool GetUnderlined() const;
wxString GetFaceName() const;
wxFontEncoding GetEncoding() const;
bool IsFixedWidth();
wxNativeFontInfo* GetNativeFontInfo() const;
wxString GetNativeFontInfoDesc() const;
wxString GetNativeFontInfoUserDesc() const;

11
wxPython/src/image.i
View File

@@ -75,6 +75,16 @@ public:
wxICOHandler();
};
class wxCURHandler : public wxICOHandler {
public:
wxCURHandler();
};
class wxANIHandler : public wxCURHandler {
public:
wxANIHandler();
};
class wxGIFHandler : public wxImageHandler {
public:
wxGIFHandler();
@@ -96,6 +106,7 @@ public:
};
//---------------------------------------------------------------------------
class wxImage : public wxObject {

8
wxPython/src/misc2.i
View File

@@ -285,13 +285,6 @@ public:
// return true if the port has certain feature
static bool HasFeature(wxSystemFeature index);
// the backwards compatible versions, don't use these methods in the new
// code!
static wxColour GetSystemColour(int index);
static wxFont GetSystemFont(int index);
static int GetSystemMetric(int index);
};
@@ -541,6 +534,7 @@ class wxStopWatch
public:
// ctor starts the stop watch
wxStopWatch();
~wxStopWatch();
void Start(long t = 0);
void Pause();
void Resume();

43
wxPython/src/msw/controls.cpp
View File

@@ -74,7 +74,6 @@ extern PyObject *SWIG_newvarlink(void);
#endif
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
PyObject* o3;
@@ -6273,6 +6272,41 @@ static PyObject *_wrap_wxTextCtrl_SetValue(PyObject *self, PyObject *args, PyObj
return _resultobj;
}
#define wxTextCtrl_GetRange(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetRange(_swigarg0,_swigarg1))
static PyObject *_wrap_wxTextCtrl_GetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxTextCtrl * _arg0;
long _arg1;
long _arg2;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","from","to", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxTextCtrl_GetRange",_kwnames,&_argo0,&_arg1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetRange. Expected _wxTextCtrl_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxTextCtrl_GetRange(_arg0,_arg1,_arg2));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
{
delete _result;
}
return _resultobj;
}
#define wxTextCtrl_GetLineLength(_swigobj,_swigarg0) (_swigobj->GetLineLength(_swigarg0))
static PyObject *_wrap_wxTextCtrl_GetLineLength(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -7024,7 +7058,6 @@ static PyObject *_wrap_wxTextCtrl_XYToPosition(PyObject *self, PyObject *args, P
#define wxTextCtrl_PositionToXY(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->PositionToXY(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxTextCtrl * _arg0;
long _arg1;
long * _arg2;
@@ -7052,11 +7085,12 @@ static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxTextCtrl_PositionToXY(_arg0,_arg1,_arg2,_arg3);
wxTextCtrl_PositionToXY(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg2));
@@ -11289,6 +11323,7 @@ static PyMethodDef controlscMethods[] = {
{ "wxTextCtrl_GetNumberOfLines", (PyCFunction) _wrap_wxTextCtrl_GetNumberOfLines, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_GetLineText", (PyCFunction) _wrap_wxTextCtrl_GetLineText, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_GetLineLength", (PyCFunction) _wrap_wxTextCtrl_GetLineLength, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_GetRange", (PyCFunction) _wrap_wxTextCtrl_GetRange, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_SetValue", (PyCFunction) _wrap_wxTextCtrl_SetValue, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_GetValue", (PyCFunction) _wrap_wxTextCtrl_GetValue, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_Create", (PyCFunction) _wrap_wxTextCtrl_Create, METH_VARARGS | METH_KEYWORDS },

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

@@ -617,6 +617,9 @@ class wxTextCtrlPtr(wxControlPtr):
def SetValue(self, *_args, **_kwargs):
val = apply(controlsc.wxTextCtrl_SetValue,(self,) + _args, _kwargs)
return val
def GetRange(self, *_args, **_kwargs):
val = apply(controlsc.wxTextCtrl_GetRange,(self,) + _args, _kwargs)
return val
def GetLineLength(self, *_args, **_kwargs):
val = apply(controlsc.wxTextCtrl_GetLineLength,(self,) + _args, _kwargs)
return val

1649
wxPython/src/msw/controls2.cpp
View File

File diff suppressed because it is too large Load Diff

149
wxPython/src/msw/controls2.py
View File

@@ -1119,6 +1119,151 @@ def wxPreTreeCtrl(*_args,**_kwargs):
return val
class wxDirItemDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def SetNewDirName(self, *_args, **_kwargs):
val = apply(controls2c.wxDirItemData_SetNewDirName,(self,) + _args, _kwargs)
return val
def __setattr__(self,name,value):
if name == "m_path" :
controls2c.wxDirItemData_m_path_set(self,value)
return
if name == "m_name" :
controls2c.wxDirItemData_m_name_set(self,value)
return
if name == "m_isHidden" :
controls2c.wxDirItemData_m_isHidden_set(self,value)
return
if name == "m_isExpanded" :
controls2c.wxDirItemData_m_isExpanded_set(self,value)
return
if name == "m_isDir" :
controls2c.wxDirItemData_m_isDir_set(self,value)
return
self.__dict__[name] = value
def __getattr__(self,name):
if name == "m_path" :
return controls2c.wxDirItemData_m_path_get(self)
if name == "m_name" :
return controls2c.wxDirItemData_m_name_get(self)
if name == "m_isHidden" :
return controls2c.wxDirItemData_m_isHidden_get(self)
if name == "m_isExpanded" :
return controls2c.wxDirItemData_m_isExpanded_get(self)
if name == "m_isDir" :
return controls2c.wxDirItemData_m_isDir_get(self)
raise AttributeError,name
def __repr__(self):
return "<C wxDirItemData instance at %s>" % (self.this,)
class wxDirItemData(wxDirItemDataPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controls2c.new_wxDirItemData,_args,_kwargs)
self.thisown = 1
class wxGenericDirCtrlPtr(wxControlPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Create(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_Create,(self,) + _args, _kwargs)
return val
def ExpandPath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_ExpandPath,(self,) + _args, _kwargs)
return val
def GetDefaultPath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetDefaultPath,(self,) + _args, _kwargs)
return val
def SetDefaultPath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_SetDefaultPath,(self,) + _args, _kwargs)
return val
def GetPath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetPath,(self,) + _args, _kwargs)
return val
def GetFilePath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetFilePath,(self,) + _args, _kwargs)
return val
def SetPath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_SetPath,(self,) + _args, _kwargs)
return val
def ShowHidden(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_ShowHidden,(self,) + _args, _kwargs)
return val
def GetShowHidden(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetShowHidden,(self,) + _args, _kwargs)
return val
def GetFilter(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetFilter,(self,) + _args, _kwargs)
return val
def SetFilter(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_SetFilter,(self,) + _args, _kwargs)
return val
def GetFilterIndex(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetFilterIndex,(self,) + _args, _kwargs)
return val
def SetFilterIndex(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_SetFilterIndex,(self,) + _args, _kwargs)
return val
def GetRootId(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetRootId,(self,) + _args, _kwargs)
if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
return val
def GetTreeCtrl(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetTreeCtrl,(self,) + _args, _kwargs)
if val: val = wxTreeCtrlPtr(val)
return val
def GetFilterListCtrl(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetFilterListCtrl,(self,) + _args, _kwargs)
if val: val = wxDirFilterListCtrlPtr(val)
return val
def __repr__(self):
return "<C wxGenericDirCtrl instance at %s>" % (self.this,)
class wxGenericDirCtrl(wxGenericDirCtrlPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controls2c.new_wxGenericDirCtrl,_args,_kwargs)
self.thisown = 1
self._setOORInfo(self)
def wxPreGenericDirCtrl(*_args,**_kwargs):
val = wxGenericDirCtrlPtr(apply(controls2c.new_wxPreGenericDirCtrl,_args,_kwargs))
val.thisown = 1
val._setOORInfo(val)
return val
class wxDirFilterListCtrlPtr(wxChoicePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Create(self, *_args, **_kwargs):
val = apply(controls2c.wxDirFilterListCtrl_Create,(self,) + _args, _kwargs)
return val
def FillFilterList(self, *_args, **_kwargs):
val = apply(controls2c.wxDirFilterListCtrl_FillFilterList,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxDirFilterListCtrl instance at %s>" % (self.this,)
class wxDirFilterListCtrl(wxDirFilterListCtrlPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controls2c.new_wxDirFilterListCtrl,_args,_kwargs)
self.thisown = 1
self._setOORInfo(self)
def wxPreDirFilterListCtrl(*_args,**_kwargs):
val = wxDirFilterListCtrlPtr(apply(controls2c.new_wxPreDirFilterListCtrl,_args,_kwargs))
val.thisown = 1
val._setOORInfo(val)
return val
#-------------- FUNCTION WRAPPERS ------------------
@@ -1266,3 +1411,7 @@ wxEVT_COMMAND_TREE_ITEM_ACTIVATED = controls2c.wxEVT_COMMAND_TREE_ITEM_ACTIVATED
wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK
wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK
wxEVT_COMMAND_TREE_END_DRAG = controls2c.wxEVT_COMMAND_TREE_END_DRAG
wxDIRCTRL_DIR_ONLY = controls2c.wxDIRCTRL_DIR_ONLY
wxDIRCTRL_SELECT_FIRST = controls2c.wxDIRCTRL_SELECT_FIRST
wxDIRCTRL_SHOW_FILTERS = controls2c.wxDIRCTRL_SHOW_FILTERS
wxDIRCTRL_3D_INTERNAL = controls2c.wxDIRCTRL_3D_INTERNAL

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

@@ -4695,6 +4695,34 @@ static PyObject *_wrap_wxFont_GetEncoding(PyObject *self, PyObject *args, PyObje
return _resultobj;
}
#define wxFont_IsFixedWidth(_swigobj) (_swigobj->IsFixedWidth())
static PyObject *_wrap_wxFont_IsFixedWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxFont * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFont_IsFixedWidth",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_IsFixedWidth. Expected _wxFont_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxFont_IsFixedWidth(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxFont_GetNativeFontInfo(_swigobj) (_swigobj->GetNativeFontInfo())
static PyObject *_wrap_wxFont_GetNativeFontInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -13125,6 +13153,7 @@ static PyMethodDef gdicMethods[] = {
{ "wxFont_GetNativeFontInfoUserDesc", (PyCFunction) _wrap_wxFont_GetNativeFontInfoUserDesc, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_GetNativeFontInfoDesc", (PyCFunction) _wrap_wxFont_GetNativeFontInfoDesc, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_GetNativeFontInfo", (PyCFunction) _wrap_wxFont_GetNativeFontInfo, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_IsFixedWidth", (PyCFunction) _wrap_wxFont_IsFixedWidth, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_GetEncoding", (PyCFunction) _wrap_wxFont_GetEncoding, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_GetFaceName", (PyCFunction) _wrap_wxFont_GetFaceName, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_GetUnderlined", (PyCFunction) _wrap_wxFont_GetUnderlined, METH_VARARGS | METH_KEYWORDS },

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

@@ -387,6 +387,9 @@ class wxFontPtr(wxGDIObjectPtr):
def GetEncoding(self, *_args, **_kwargs):
val = apply(gdic.wxFont_GetEncoding,(self,) + _args, _kwargs)
return val
def IsFixedWidth(self, *_args, **_kwargs):
val = apply(gdic.wxFont_IsFixedWidth,(self,) + _args, _kwargs)
return val
def GetNativeFontInfo(self, *_args, **_kwargs):
val = apply(gdic.wxFont_GetNativeFontInfo,(self,) + _args, _kwargs)
if val: val = wxNativeFontInfoPtr(val)

135
wxPython/src/msw/image.cpp
View File

@@ -916,6 +916,130 @@ static PyObject *_wrap_new_wxICOHandler(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
static void *SwigwxCURHandlerTowxICOHandler(void *ptr) {
wxCURHandler *src;
wxICOHandler *dest;
src = (wxCURHandler *) ptr;
dest = (wxICOHandler *) src;
return (void *) dest;
}
static void *SwigwxCURHandlerTowxBMPHandler(void *ptr) {
wxCURHandler *src;
wxBMPHandler *dest;
src = (wxCURHandler *) ptr;
dest = (wxBMPHandler *) src;
return (void *) dest;
}
static void *SwigwxCURHandlerTowxImageHandler(void *ptr) {
wxCURHandler *src;
wxImageHandler *dest;
src = (wxCURHandler *) ptr;
dest = (wxImageHandler *) src;
return (void *) dest;
}
static void *SwigwxCURHandlerTowxObject(void *ptr) {
wxCURHandler *src;
wxObject *dest;
src = (wxCURHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxCURHandler() (new wxCURHandler())
static PyObject *_wrap_new_wxCURHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxCURHandler * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxCURHandler",_kwnames))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxCURHandler *)new_wxCURHandler();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxCURHandler_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
static void *SwigwxANIHandlerTowxCURHandler(void *ptr) {
wxANIHandler *src;
wxCURHandler *dest;
src = (wxANIHandler *) ptr;
dest = (wxCURHandler *) src;
return (void *) dest;
}
static void *SwigwxANIHandlerTowxICOHandler(void *ptr) {
wxANIHandler *src;
wxICOHandler *dest;
src = (wxANIHandler *) ptr;
dest = (wxICOHandler *) src;
return (void *) dest;
}
static void *SwigwxANIHandlerTowxBMPHandler(void *ptr) {
wxANIHandler *src;
wxBMPHandler *dest;
src = (wxANIHandler *) ptr;
dest = (wxBMPHandler *) src;
return (void *) dest;
}
static void *SwigwxANIHandlerTowxImageHandler(void *ptr) {
wxANIHandler *src;
wxImageHandler *dest;
src = (wxANIHandler *) ptr;
dest = (wxImageHandler *) src;
return (void *) dest;
}
static void *SwigwxANIHandlerTowxObject(void *ptr) {
wxANIHandler *src;
wxObject *dest;
src = (wxANIHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxANIHandler() (new wxANIHandler())
static PyObject *_wrap_new_wxANIHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxANIHandler * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxANIHandler",_kwnames))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxANIHandler *)new_wxANIHandler();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxANIHandler_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
static void *SwigwxGIFHandlerTowxImageHandler(void *ptr) {
wxGIFHandler *src;
wxImageHandler *dest;
@@ -2891,6 +3015,8 @@ static PyMethodDef imagecMethods[] = {
{ "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_wxANIHandler", (PyCFunction) _wrap_new_wxANIHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxCURHandler", (PyCFunction) _wrap_new_wxCURHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxICOHandler", (PyCFunction) _wrap_new_wxICOHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxBMPHandler", (PyCFunction) _wrap_new_wxBMPHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxJPEGHandler", (PyCFunction) _wrap_new_wxJPEGHandler, METH_VARARGS | METH_KEYWORDS },
@@ -2920,7 +3046,11 @@ static PyMethodDef imagecMethods[] = {
*/
static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_signed_long","_long",0},
{ "_wxBMPHandler","_wxANIHandler",SwigwxANIHandlerTowxBMPHandler},
{ "_wxBMPHandler","_wxCURHandler",SwigwxCURHandlerTowxBMPHandler},
{ "_wxBMPHandler","_wxICOHandler",SwigwxICOHandlerTowxBMPHandler},
{ "_wxICOHandler","_wxANIHandler",SwigwxANIHandlerTowxICOHandler},
{ "_wxICOHandler","_wxCURHandler",SwigwxCURHandlerTowxICOHandler},
{ "_wxPrintQuality","_wxCoord",0},
{ "_wxPrintQuality","_int",0},
{ "_wxPrintQuality","_signed_int",0},
@@ -2934,6 +3064,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxImageHandler","_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler},
{ "_wxImageHandler","_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler},
{ "_wxImageHandler","_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler},
{ "_wxImageHandler","_wxANIHandler",SwigwxANIHandlerTowxImageHandler},
{ "_wxImageHandler","_wxCURHandler",SwigwxCURHandlerTowxImageHandler},
{ "_wxImageHandler","_wxICOHandler",SwigwxICOHandlerTowxImageHandler},
{ "_wxImageHandler","_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler},
{ "_wxImageHandler","_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler},
@@ -2980,6 +3112,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxPCXHandler",SwigwxPCXHandlerTowxObject},
{ "_wxObject","_wxPNMHandler",SwigwxPNMHandlerTowxObject},
{ "_wxObject","_wxGIFHandler",SwigwxGIFHandlerTowxObject},
{ "_wxObject","_wxANIHandler",SwigwxANIHandlerTowxObject},
{ "_wxObject","_wxCURHandler",SwigwxCURHandlerTowxObject},
{ "_wxObject","_wxICOHandler",SwigwxICOHandlerTowxObject},
{ "_wxObject","_wxBMPHandler",SwigwxBMPHandlerTowxObject},
{ "_wxObject","_wxJPEGHandler",SwigwxJPEGHandlerTowxObject},
@@ -2987,6 +3121,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxImageHandler",SwigwxImageHandlerTowxObject},
{ "_signed_short","_WXTYPE",0},
{ "_signed_short","_short",0},
{ "_wxCURHandler","_wxANIHandler",SwigwxANIHandlerTowxCURHandler},
{ "_unsigned_char","_byte",0},
{ "_unsigned_int","_wxCoord",0},
{ "_unsigned_int","_wxPrintQuality",0},

28
wxPython/src/msw/image.py
View File

@@ -100,6 +100,34 @@ class wxICOHandler(wxICOHandlerPtr):
class wxCURHandlerPtr(wxICOHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxCURHandler instance at %s>" % (self.this,)
class wxCURHandler(wxCURHandlerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(imagec.new_wxCURHandler,_args,_kwargs)
self.thisown = 1
class wxANIHandlerPtr(wxCURHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxANIHandler instance at %s>" % (self.this,)
class wxANIHandler(wxANIHandlerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(imagec.new_wxANIHandler,_args,_kwargs)
self.thisown = 1
class wxGIFHandlerPtr(wxImageHandlerPtr):
def __init__(self,this):
self.this = this

93
wxPython/src/msw/misc2.cpp
View File

@@ -2362,67 +2362,6 @@ static PyObject *_wrap_wxSystemSettings_HasFeature(PyObject *self, PyObject *arg
return _resultobj;
}
static PyObject *_wrap_wxSystemSettings_GetSystemColour(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxColour * _result;
int _arg0;
char *_kwnames[] = { "index", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_GetSystemColour",_kwnames,&_arg0))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxSystemSettings::GetColour(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static PyObject *_wrap_wxSystemSettings_GetSystemFont(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxFont * _result;
int _arg0;
char *_kwnames[] = { "index", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_GetSystemFont",_kwnames,&_arg0))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxFont (wxSystemSettings::GetFont(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static PyObject *_wrap_wxSystemSettings_GetSystemMetric(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
int _arg0;
char *_kwnames[] = { "index", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_GetSystemMetric",_kwnames,&_arg0))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSystemSettings::GetMetric(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static void *SwigwxToolTipTowxObject(void *ptr) {
wxToolTip *src;
wxObject *dest;
@@ -4552,6 +4491,34 @@ static PyObject *_wrap_new_wxStopWatch(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
#define delete_wxStopWatch(_swigobj) (delete _swigobj)
static PyObject *_wrap_delete_wxStopWatch(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxStopWatch * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxStopWatch",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStopWatch_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxStopWatch. Expected _wxStopWatch_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete_wxStopWatch(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxStopWatch_Start(_swigobj,_swigarg0) (_swigobj->Start(_swigarg0))
static PyObject *_wrap_wxStopWatch_Start(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -10386,6 +10353,7 @@ static PyMethodDef misc2cMethods[] = {
{ "wxStopWatch_Resume", (PyCFunction) _wrap_wxStopWatch_Resume, METH_VARARGS | METH_KEYWORDS },
{ "wxStopWatch_Pause", (PyCFunction) _wrap_wxStopWatch_Pause, METH_VARARGS | METH_KEYWORDS },
{ "wxStopWatch_Start", (PyCFunction) _wrap_wxStopWatch_Start, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxStopWatch", (PyCFunction) _wrap_delete_wxStopWatch, METH_VARARGS | METH_KEYWORDS },
{ "new_wxStopWatch", (PyCFunction) _wrap_new_wxStopWatch, METH_VARARGS | METH_KEYWORDS },
{ "wxPyTimer_Stop", (PyCFunction) _wrap_wxPyTimer_Stop, METH_VARARGS | METH_KEYWORDS },
{ "wxPyTimer_Start", (PyCFunction) _wrap_wxPyTimer_Start, METH_VARARGS | METH_KEYWORDS },
@@ -10448,9 +10416,6 @@ static PyMethodDef misc2cMethods[] = {
{ "wxToolTip_GetTip", (PyCFunction) _wrap_wxToolTip_GetTip, METH_VARARGS | METH_KEYWORDS },
{ "wxToolTip_SetTip", (PyCFunction) _wrap_wxToolTip_SetTip, METH_VARARGS | METH_KEYWORDS },
{ "new_wxToolTip", (PyCFunction) _wrap_new_wxToolTip, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetSystemMetric", (PyCFunction) _wrap_wxSystemSettings_GetSystemMetric, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetSystemFont", (PyCFunction) _wrap_wxSystemSettings_GetSystemFont, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetSystemColour", (PyCFunction) _wrap_wxSystemSettings_GetSystemColour, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_HasFeature", (PyCFunction) _wrap_wxSystemSettings_HasFeature, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetMetric", (PyCFunction) _wrap_wxSystemSettings_GetMetric, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetFont", (PyCFunction) _wrap_wxSystemSettings_GetFont, METH_VARARGS | METH_KEYWORDS },

15
wxPython/src/msw/misc2.py
View File

@@ -332,6 +332,9 @@ class wxStopWatchPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,misc2c=misc2c):
if self.thisown == 1 :
misc2c.delete_wxStopWatch(self)
def Start(self, *_args, **_kwargs):
val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs)
return val
@@ -1151,18 +1154,6 @@ wxSystemSettings_GetMetric = misc2c.wxSystemSettings_GetMetric
wxSystemSettings_HasFeature = misc2c.wxSystemSettings_HasFeature
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

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

@@ -2015,6 +2015,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxTE_MULTILINE", PyInt_FromLong((long) wxTE_MULTILINE));
PyDict_SetItemString(d,"wxTE_PROCESS_TAB", PyInt_FromLong((long) wxTE_PROCESS_TAB));
PyDict_SetItemString(d,"wxTE_RICH", PyInt_FromLong((long) wxTE_RICH));
PyDict_SetItemString(d,"wxTE_RICH2", PyInt_FromLong((long) wxTE_RICH2));
PyDict_SetItemString(d,"wxTE_NO_VSCROLL", PyInt_FromLong((long) wxTE_NO_VSCROLL));
PyDict_SetItemString(d,"wxTE_AUTO_SCROLL", PyInt_FromLong((long) wxTE_AUTO_SCROLL));
PyDict_SetItemString(d,"wxTE_PROCESS_ENTER", PyInt_FromLong((long) wxTE_PROCESS_ENTER));
@@ -2407,6 +2408,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxBITMAP_TYPE_PICT_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_PICT_RESOURCE));
PyDict_SetItemString(d,"wxBITMAP_TYPE_ICON", PyInt_FromLong((long) wxBITMAP_TYPE_ICON));
PyDict_SetItemString(d,"wxBITMAP_TYPE_ICON_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_ICON_RESOURCE));
PyDict_SetItemString(d,"wxBITMAP_TYPE_ANI", PyInt_FromLong((long) wxBITMAP_TYPE_ANI));
PyDict_SetItemString(d,"wxBITMAP_TYPE_MACCURSOR", PyInt_FromLong((long) wxBITMAP_TYPE_MACCURSOR));
PyDict_SetItemString(d,"wxBITMAP_TYPE_MACCURSOR_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_MACCURSOR_RESOURCE));
PyDict_SetItemString(d,"wxBITMAP_TYPE_ANY", PyInt_FromLong((long) wxBITMAP_TYPE_ANY));

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

@@ -249,6 +249,7 @@ wxTE_READONLY = wxc.wxTE_READONLY
wxTE_MULTILINE = wxc.wxTE_MULTILINE
wxTE_PROCESS_TAB = wxc.wxTE_PROCESS_TAB
wxTE_RICH = wxc.wxTE_RICH
wxTE_RICH2 = wxc.wxTE_RICH2
wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL
wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL
wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER
@@ -641,6 +642,7 @@ wxBITMAP_TYPE_PICT = wxc.wxBITMAP_TYPE_PICT
wxBITMAP_TYPE_PICT_RESOURCE = wxc.wxBITMAP_TYPE_PICT_RESOURCE
wxBITMAP_TYPE_ICON = wxc.wxBITMAP_TYPE_ICON
wxBITMAP_TYPE_ICON_RESOURCE = wxc.wxBITMAP_TYPE_ICON_RESOURCE
wxBITMAP_TYPE_ANI = wxc.wxBITMAP_TYPE_ANI
wxBITMAP_TYPE_MACCURSOR = wxc.wxBITMAP_TYPE_MACCURSOR
wxBITMAP_TYPE_MACCURSOR_RESOURCE = wxc.wxBITMAP_TYPE_MACCURSOR_RESOURCE
wxBITMAP_TYPE_ANY = wxc.wxBITMAP_TYPE_ANY
@@ -1445,12 +1447,6 @@ class wxTimer(wxPyTimer):
wxPyTimer.__init__(self, None)
self.SetOwner(evtHandler, id)
#----------------------------------------------------------------------
NULL = None # For backwards compatibility only. You should really be
# using None now.
#----------------------------------------------------------------------
# aliases
@@ -1462,7 +1458,10 @@ wxPen = wxPyPen
wxNoRefBitmap = wxBitmap
wxPyDefaultPosition = wxDefaultPosition
wxPyDefaultSize = wxDefaultSize
NULL = None
wxSystemSettings_GetSystemColour = wxSystemSettings_GetColour
wxSystemSettings_GetSystemFont = wxSystemSettings_GetFont
wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
#----------------------------------------------------------------------
# wxGTK sets the locale when initialized. Doing this at the Python

17
wxPython/src/my_typemaps.i
View File

@@ -312,6 +312,23 @@
$target = t_output_helper($target, o);
}
%typemap(python,ignore) bool *T_OUTPUT(int temp)
{
$target = (bool*)&temp;
}
%typemap(python,argout) bool *T_OUTPUT
{
PyObject *o;
o = PyInt_FromLong((long) (*$source));
$target = t_output_helper($target, o);
}
%typemap(python,ignore) bool *OUTPUT = bool *T_OUTPUT;
%typemap(python,argout) bool *OUTPUT = bool *T_OUTPUT;
//---------------------------------------------------------------------------
// Typemaps to convert return values that are base class pointers
// to the real derived type, if possible. See wxPyMake_wxObject in