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

changed version number

Browse Source 
A few final twaeks and fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-05-22 05:59:09 +00:00
parent 6d5b2a57cf
commit 25832b3f2b
23 changed files with 158 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/src/__version__.py
View File

@@ -1 +1 @@
ver = '2.3b4'
ver = '2.3.0'

1
wxPython/src/_defs.i
View File

@@ -212,6 +212,7 @@ enum {
wxRESIZE_BORDER,
wxDIALOG_MODAL,
wxDIALOG_MODELESS,
wxDIALOG_NO_PARENT,
wxDEFAULT_FRAME_STYLE,
wxDEFAULT_DIALOG_STYLE,

4
wxPython/src/cmndlgs.i
View File

@@ -42,7 +42,7 @@ public:
~wxColourData();
bool GetChooseFull();
wxColour& GetColour();
wxColour GetColour();
wxColour GetCustomColour(int i);
void SetChooseFull(int flag);
void SetColour(const wxColour& colour);
@@ -198,7 +198,7 @@ public:
void EnableEffects(bool enable);
bool GetAllowSymbols();
wxColour& GetColour();
wxColour GetColour();
wxFont GetChosenFont();
bool GetEnableEffects();
wxFont GetInitialFont();

8
wxPython/src/gdi.i
View File

@@ -442,7 +442,7 @@ public:
~wxPen();
int GetCap();
wxColour& GetColour();
wxColour GetColour();
int GetJoin();
int GetStyle();
@@ -482,7 +482,7 @@ public:
wxBrush(const wxColour& colour, int style=wxSOLID);
~wxBrush();
wxColour& GetColour();
wxColour GetColour();
wxBitmap * GetStipple();
int GetStyle();
bool Ok();
@@ -567,12 +567,12 @@ public:
%name(GetSizeTuple)void GetSize(int* OUTPUT, int* OUTPUT);
wxSize GetSize();
wxSize GetSizeMM();
wxColour& GetTextBackground();
wxColour GetTextBackground();
void GetTextExtent(const wxString& string, long *OUTPUT, long *OUTPUT);
%name(GetFullTextExtent)void GetTextExtent(const wxString& string,
long *OUTPUT, long *OUTPUT, long *OUTPUT, long* OUTPUT,
const wxFont* font = NULL);
wxColour& GetTextForeground();
wxColour GetTextForeground();
void GetUserScale(double *OUTPUT, double *OUTPUT);
long LogicalToDeviceX(long x);
long LogicalToDeviceXRel(long x);

24
wxPython/src/msw/cmndlgs.cpp
View File

@@ -207,18 +207,12 @@ static PyObject *_wrap_wxColourData_GetColour(PyObject *self, PyObject *args, Py
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxColour & _result_ref = wxColourData_GetColour(_arg0);
_result = (wxColour *) &_result_ref;
_result = new wxColour (wxColourData_GetColour(_arg0));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
@@ -2171,18 +2165,12 @@ static PyObject *_wrap_wxFontData_GetColour(PyObject *self, PyObject *args, PyOb
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxColour & _result_ref = wxFontData_GetColour(_arg0);
_result = (wxColour *) &_result_ref;
_result = new wxColour (wxFontData_GetColour(_arg0));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}

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

@@ -29,7 +29,7 @@ class wxColourDataPtr(wxObjectPtr):
return val
def GetColour(self, *_args, **_kwargs):
val = apply(cmndlgsc.wxColourData_GetColour,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val)
if val: val = wxColourPtr(val) ; val.thisown = 1
return val
def GetCustomColour(self, *_args, **_kwargs):
val = apply(cmndlgsc.wxColourData_GetCustomColour,(self,) + _args, _kwargs)
@@ -241,7 +241,7 @@ class wxFontDataPtr(wxObjectPtr):
return val
def GetColour(self, *_args, **_kwargs):
val = apply(cmndlgsc.wxFontData_GetColour,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val)
if val: val = wxColourPtr(val) ; val.thisown = 1
return val
def GetChosenFont(self, *_args, **_kwargs):
val = apply(cmndlgsc.wxFontData_GetChosenFont,(self,) + _args, _kwargs)

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

@@ -4523,18 +4523,12 @@ static PyObject *_wrap_wxPen_GetColour(PyObject *self, PyObject *args, PyObject
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxColour & _result_ref = wxPen_GetColour(_arg0);
_result = (wxColour *) &_result_ref;
_result = new wxColour (wxPen_GetColour(_arg0));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
@@ -5187,18 +5181,12 @@ static PyObject *_wrap_wxBrush_GetColour(PyObject *self, PyObject *args, PyObjec
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxColour & _result_ref = wxBrush_GetColour(_arg0);
_result = (wxColour *) &_result_ref;
_result = new wxColour (wxBrush_GetColour(_arg0));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
@@ -7063,18 +7051,12 @@ static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args, Py
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxColour & _result_ref = wxDC_GetTextBackground(_arg0);
_result = (wxColour *) &_result_ref;
_result = new wxColour (wxDC_GetTextBackground(_arg0));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
@@ -7272,18 +7254,12 @@ static PyObject *_wrap_wxDC_GetTextForeground(PyObject *self, PyObject *args, Py
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxColour & _result_ref = wxDC_GetTextForeground(_arg0);
_result = (wxColour *) &_result_ref;
_result = new wxColour (wxDC_GetTextForeground(_arg0));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}

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

@@ -414,7 +414,7 @@ class wxPenPtr(wxGDIObjectPtr):
return val
def GetColour(self, *_args, **_kwargs):
val = apply(gdic.wxPen_GetColour,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val)
if val: val = wxColourPtr(val) ; val.thisown = 1
return val
def GetJoin(self, *_args, **_kwargs):
val = apply(gdic.wxPen_GetJoin,(self,) + _args, _kwargs)
@@ -498,7 +498,7 @@ class wxBrushPtr(wxGDIObjectPtr):
gdic.delete_wxBrush(self)
def GetColour(self, *_args, **_kwargs):
val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val)
if val: val = wxColourPtr(val) ; val.thisown = 1
return val
def GetStipple(self, *_args, **_kwargs):
val = apply(gdic.wxBrush_GetStipple,(self,) + _args, _kwargs)
@@ -694,7 +694,7 @@ class wxDCPtr(wxObjectPtr):
return val
def GetTextBackground(self, *_args, **_kwargs):
val = apply(gdic.wxDC_GetTextBackground,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val)
if val: val = wxColourPtr(val) ; val.thisown = 1
return val
def GetTextExtent(self, *_args, **_kwargs):
val = apply(gdic.wxDC_GetTextExtent,(self,) + _args, _kwargs)
@@ -704,7 +704,7 @@ class wxDCPtr(wxObjectPtr):
return val
def GetTextForeground(self, *_args, **_kwargs):
val = apply(gdic.wxDC_GetTextForeground,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val)
if val: val = wxColourPtr(val) ; val.thisown = 1
return val
def GetUserScale(self, *_args, **_kwargs):
val = apply(gdic.wxDC_GetUserScale,(self,) + _args, _kwargs)

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

@@ -631,24 +631,6 @@ static PyObject *_wrap_wxEnableTopLevelWindows(PyObject *self, PyObject *args, P
return _resultobj;
}
static PyObject *_wrap_wxFlushEvents(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxFlushEvents",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
wxFlushEvents();
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static PyObject *_wrap_wxGetResource(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
char * _result;
@@ -4192,7 +4174,6 @@ static PyMethodDef misccMethods[] = {
{ "wxGetEmailAddress", (PyCFunction) _wrap_wxGetEmailAddress, METH_VARARGS | METH_KEYWORDS },
{ "wxStripMenuCodes", (PyCFunction) _wrap_wxStripMenuCodes, METH_VARARGS | METH_KEYWORDS },
{ "wxGetResource", (PyCFunction) _wrap_wxGetResource, METH_VARARGS | METH_KEYWORDS },
{ "wxFlushEvents", (PyCFunction) _wrap_wxFlushEvents, 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 },

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

@@ -587,8 +587,6 @@ wxYieldIfNeeded = miscc.wxYieldIfNeeded
wxEnableTopLevelWindows = miscc.wxEnableTopLevelWindows
wxFlushEvents = miscc.wxFlushEvents
wxGetResource = miscc.wxGetResource
wxStripMenuCodes = miscc.wxStripMenuCodes

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

@@ -1425,6 +1425,23 @@ static PyObject *_wrap_wxCheckForInterrupt(PyObject *self, PyObject *args, PyObj
return _resultobj;
}
static PyObject *_wrap_wxFlushEvents(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxFlushEvents",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
wxFlushEvents();
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static PyObject *_wrap_wxResourceAddIdentifier(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
@@ -7234,6 +7251,7 @@ static PyMethodDef misc2cMethods[] = {
{ "wxResourceCreateBitmap", (PyCFunction) _wrap_wxResourceCreateBitmap, METH_VARARGS | METH_KEYWORDS },
{ "wxResourceClear", (PyCFunction) _wrap_wxResourceClear, METH_VARARGS | METH_KEYWORDS },
{ "wxResourceAddIdentifier", (PyCFunction) _wrap_wxResourceAddIdentifier, METH_VARARGS | METH_KEYWORDS },
{ "wxFlushEvents", (PyCFunction) _wrap_wxFlushEvents, METH_VARARGS | METH_KEYWORDS },
{ "wxCheckForInterrupt", (PyCFunction) _wrap_wxCheckForInterrupt, METH_VARARGS | METH_KEYWORDS },
{ "wxFindWindowAtPoint", (PyCFunction) _wrap_wxFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS },
{ "wxGenericFindWindowAtPoint", (PyCFunction) _wrap_wxGenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS },

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

@@ -726,6 +726,8 @@ def wxFindWindowAtPoint(*_args, **_kwargs):
wxCheckForInterrupt = misc2c.wxCheckForInterrupt
wxFlushEvents = misc2c.wxFlushEvents
wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
wxResourceClear = misc2c.wxResourceClear

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

@@ -9976,18 +9976,12 @@ static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *self, PyObject *args,
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxColour & _result_ref = wxMenuItem_GetTextColour(_arg0);
_result = (wxColour *) &_result_ref;
_result = new wxColour (wxMenuItem_GetTextColour(_arg0));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
@@ -10048,18 +10042,12 @@ static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *self, PyObject *
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxColour & _result_ref = wxMenuItem_GetBackgroundColour(_arg0);
_result = (wxColour *) &_result_ref;
_result = new wxColour (wxMenuItem_GetBackgroundColour(_arg0));
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}

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

@@ -950,14 +950,14 @@ class wxMenuItemPtr(wxObjectPtr):
return val
def GetTextColour(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuItem_GetTextColour,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val)
if val: val = wxColourPtr(val) ; val.thisown = 1
return val
def SetBackgroundColour(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuItem_SetBackgroundColour,(self,) + _args, _kwargs)
return val
def GetBackgroundColour(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuItem_GetBackgroundColour,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val)
if val: val = wxColourPtr(val) ; val.thisown = 1
return val
def SetBitmaps(self, *_args, **_kwargs):
val = apply(windowsc.wxMenuItem_SetBitmaps,(self,) + _args, _kwargs)

4
wxPython/src/windows.i
View File

@@ -696,9 +696,9 @@ public:
void SetFont(const wxFont& font);
wxFont& GetFont();
void SetTextColour(const wxColour& colText);
wxColour& GetTextColour();
wxColour GetTextColour();
void SetBackgroundColour(const wxColour& colBack);
wxColour& GetBackgroundColour();
wxColour GetBackgroundColour();
void SetBitmaps(const wxBitmap& bmpChecked,
const wxBitmap& bmpUnchecked = wxNullBitmap);
void SetBitmap(const wxBitmap& bmpChecked);

12
wxPython/src/windows2.i
View File

@@ -59,9 +59,9 @@ public:
void SetTextValue(const wxString& str);
wxFont& GetFont();
void SetFont(wxFont& f);
wxColour& GetTextColour();
wxColour GetTextColour();
void SetTextColour(const wxColour& colour);
wxColour& GetBackgroundColour();
wxColour GetBackgroundColour();
void SetBackgroundColour(const wxColour& colour);
wxBrush& GetBackgroundBrush();
int GetAlignment();
@@ -122,7 +122,7 @@ public:
wxGridCell* GetCell(int row, int col);
int GetCellAlignment(int row, int col);
%name(GetDefCellAlignment)int GetCellAlignment();
wxColour& GetCellBackgroundColour(int row, int col);
wxColour GetCellBackgroundColour(int row, int col);
%name(GetDefCellBackgroundColour) wxColour& GetCellBackgroundColour();
//wxGridCell *** GetCells();
@@ -148,7 +148,7 @@ public:
return rows;
}
}
wxColour& GetCellTextColour(int row, int col);
wxColour GetCellTextColour(int row, int col);
%name(GetDefCellTextColour)wxColour& GetCellTextColour();
wxFont& GetCellTextFont(int row, int col);
%name(GetDefCellTextFont)wxFont& GetCellTextFont();
@@ -161,9 +161,9 @@ public:
bool GetEditable();
wxScrollBar * GetHorizScrollBar();
int GetLabelAlignment(int orientation);
wxColour& GetLabelBackgroundColour();
wxColour GetLabelBackgroundColour();
int GetLabelSize(int orientation);
wxColour& GetLabelTextColour();
wxColour GetLabelTextColour();
wxFont& GetLabelTextFont();
wxString& GetLabelValue(int orientation, int pos);
int GetRowHeight(int row);