wxPython 2.1b1:
Added the missing wxWindow.GetUpdateRegion() method. Made a new change in SWIG (update your patches everybody) that provides a fix for global shadow objects that get an exception in their __del__ when their extension module has already been deleted. It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about line 496 if you want to do it by hand. It is now possible to run through MainLoop more than once in any one process. The cleanup that used to happen as MainLoop completed (and prevented it from running again) has been delayed until the wxc module is being unloaded by Python. wxWindow.PopupMenu() now takes a wxPoint instead of x,y. Added wxWindow.PopupMenuXY to be consistent with some other methods. Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace. You can now provide your own app.MainLoop method. See wxPython/demo/demoMainLoop.py for an example and some explaination. Got the in-place-edit for the wxTreeCtrl fixed and added some demo code to show how to use it. Put the wxIcon constructor back in for GTK as it now has one that matches MSW's. Added wxGrid.GetCells Added wxSystemSettings static methods as functions with names like wxSystemSettings_GetSystemColour. Removed wxPyMenu since using menu callbacks have been depreciated in wxWindows. Use wxMenu and events instead. Added alternate wxBitmap constructor (for MSW only) as wxBitmapFromData(data, type, width, height, depth = 1) Added a helper function named wxPyTypeCast that can convert shadow objects of one type into shadow objects of another type. (Like doing a down-cast.) See the implementation in wx.py for some docs. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,6 +25,8 @@
|
||||
%include my_typemaps.i
|
||||
%include _defs.i
|
||||
|
||||
%include pointer.i
|
||||
|
||||
%import misc.i
|
||||
%import misc2.i
|
||||
%import windows.i
|
||||
@@ -47,7 +49,7 @@
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
#define __version__ "2.1b1"
|
||||
#define __version__ "2.1b2"
|
||||
|
||||
wxPoint wxPyDefaultPosition;
|
||||
wxSize wxPyDefaultSize;
|
||||
@@ -64,6 +66,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
~wxPyApp();
|
||||
|
||||
wxString GetAppName();
|
||||
#ifdef __WXMSW__
|
||||
@@ -80,6 +83,7 @@ public:
|
||||
bool Initialized();
|
||||
int MainLoop();
|
||||
bool Pending();
|
||||
bool ProcessIdle();
|
||||
|
||||
void SetAppName(const wxString& name);
|
||||
#ifdef __WXMSW__
|
||||
@@ -91,9 +95,31 @@ public:
|
||||
void SetTopWindow(wxWindow* window);
|
||||
void SetVendorName(const wxString& name);
|
||||
|
||||
// This one is wxPython specific. If you override MainLoop,
|
||||
// call this when done.
|
||||
void AfterMainLoop();
|
||||
wxIcon GetStdIcon(int which);
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// An instance of this object is created in the main wx module. As long
|
||||
// as there are no extra references to it then when the wx module is being
|
||||
// unloaded from memory then this object's destructor will be called. When
|
||||
// it is then we'll use that as a signal to clean up wxWindows
|
||||
|
||||
%{
|
||||
class __wxPyCleanup {
|
||||
public:
|
||||
__wxPyCleanup() { }
|
||||
~__wxPyCleanup() { wxApp::CleanUp(); }
|
||||
};
|
||||
%}
|
||||
|
||||
// now to swigify it...
|
||||
class __wxPyCleanup {
|
||||
public:
|
||||
__wxPyCleanup();
|
||||
~__wxPyCleanup();
|
||||
};
|
||||
|
||||
|
||||
@@ -120,6 +146,7 @@ extern "C" SWIGEXPORT(void,initimagec)();
|
||||
extern "C" SWIGEXPORT(void,initprintfwc)();
|
||||
#ifndef SEPARATE
|
||||
extern "C" SWIGEXPORT(void,initutilsc)();
|
||||
//extern "C" SWIGEXPORT(void,initoglc)();
|
||||
extern "C" SWIGEXPORT(void,initglcanvasc)();
|
||||
#endif
|
||||
%}
|
||||
@@ -130,7 +157,6 @@ extern "C" SWIGEXPORT(void,initglcanvasc)();
|
||||
|
||||
__wxPreStart(); // initialize the GUI toolkit, if needed.
|
||||
|
||||
// wxPyWindows = new wxHashTable(wxKEY_INTEGER, 100);
|
||||
|
||||
// Since these modules are all linked together, initialize them now
|
||||
// because python won't be able to find their shared library files,
|
||||
@@ -152,6 +178,7 @@ extern "C" SWIGEXPORT(void,initglcanvasc)();
|
||||
initprintfwc();
|
||||
#ifndef SEPARATE
|
||||
initutilsc();
|
||||
// initoglc();
|
||||
#ifdef WITH_GLCANVAS
|
||||
initglcanvasc();
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user