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

some cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-06-13 03:44:42 +00:00
parent 27e4c09614
commit cc2a0b0170
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wxPython/src/misc.i
View File

@@ -211,22 +211,6 @@ public:
}; };
// %inline %{
// bool wxIntersectRect(wxRect* dest, wxRect* r1, wxRect* r2) {
// wxRegion reg1(*r1);
// wxRegion reg2(*r2);
// bool success;
// *dest = wxRect(0,0,0,0);
// success = reg1.Intersect(reg2);
// if (success) {
// *dest = reg1.GetBox();
// return *dest != wxRect(0,0,0,0);
// }
// return FALSE;
// }
// %}
%inline %{ %inline %{
PyObject* wxIntersectRect(wxRect* r1, wxRect* r2) { PyObject* wxIntersectRect(wxRect* r1, wxRect* r2) {
wxRegion reg1(*r1); wxRegion reg1(*r1);
@@ -431,7 +415,7 @@ public:
%readonly %readonly
%{ %{
#if 0 // we want to use the definition from the header, no the #if 0 // we want to use the definition from the header, not the
// one SWIG will generate. // one SWIG will generate.
%} %}
extern wxAcceleratorTable wxNullAcceleratorTable; extern wxAcceleratorTable wxNullAcceleratorTable;

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

@@ -134,7 +134,7 @@ static char* wxStringErrorMsg = "string type is required for parameter";
return retval; return retval;
} }
#if 0 // we want to use the definition from the header, no the #if 0 // we want to use the definition from the header, not the
// one SWIG will generate. // one SWIG will generate.
extern wxAcceleratorTable wxNullAcceleratorTable; extern wxAcceleratorTable wxNullAcceleratorTable;