A huge glob of changes in the 2.4 branch merged over to HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2415,6 +2415,7 @@ SWIGEXPORT(void) initwxc() {
|
||||
PyDict_SetItemString(d,"wxMENU_TEAROFF", PyInt_FromLong((long) wxMENU_TEAROFF));
|
||||
PyDict_SetItemString(d,"wxMB_DOCKABLE", PyInt_FromLong((long) wxMB_DOCKABLE));
|
||||
PyDict_SetItemString(d,"wxNO_FULL_REPAINT_ON_RESIZE", PyInt_FromLong((long) wxNO_FULL_REPAINT_ON_RESIZE));
|
||||
PyDict_SetItemString(d,"wxFULL_REPAINT_ON_RESIZE", PyInt_FromLong((long) wxFULL_REPAINT_ON_RESIZE));
|
||||
PyDict_SetItemString(d,"wxLEFT", PyInt_FromLong((long) wxLEFT));
|
||||
PyDict_SetItemString(d,"wxRIGHT", PyInt_FromLong((long) wxRIGHT));
|
||||
PyDict_SetItemString(d,"wxUP", PyInt_FromLong((long) wxUP));
|
||||
|
@@ -438,6 +438,7 @@ wxDD_DEFAULT_STYLE = wxc.wxDD_DEFAULT_STYLE
|
||||
wxMENU_TEAROFF = wxc.wxMENU_TEAROFF
|
||||
wxMB_DOCKABLE = wxc.wxMB_DOCKABLE
|
||||
wxNO_FULL_REPAINT_ON_RESIZE = wxc.wxNO_FULL_REPAINT_ON_RESIZE
|
||||
wxFULL_REPAINT_ON_RESIZE = wxc.wxFULL_REPAINT_ON_RESIZE
|
||||
wxLEFT = wxc.wxLEFT
|
||||
wxRIGHT = wxc.wxRIGHT
|
||||
wxUP = wxc.wxUP
|
||||
@@ -1901,8 +1902,11 @@ of your Mac."""
|
||||
# KeyboardInterrupt???) but will later segfault on exit. By
|
||||
# setting the default handler then the app will exit, as
|
||||
# expected (depending on platform.)
|
||||
import signal
|
||||
signal.signal(signal.SIGINT, signal.SIG_DFL)
|
||||
try:
|
||||
import signal
|
||||
signal.signal(signal.SIGINT, signal.SIG_DFL)
|
||||
except:
|
||||
pass
|
||||
|
||||
# this initializes wxWindows and then calls our OnInit
|
||||
_wxStart(self.OnInit)
|
||||
|
@@ -16,6 +16,10 @@
|
||||
#include <wx/wx.h>
|
||||
#include <wx/geometry.h>
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
#ifdef __WXMAC__ // avoid a bug in Carbon headers
|
||||
#define scalb scalbn
|
||||
#endif
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
typedef unsigned char byte;
|
||||
|
Reference in New Issue
Block a user