diff --git a/etg/event.py b/etg/event.py index aeb506f4..49edfd7c 100644 --- a/etg/event.py +++ b/etg/event.py @@ -44,6 +44,7 @@ ITEMS = [ 'wxJoystickEvent', 'wxKeyEvent', 'wxMaximizeEvent', + 'wxFullScreenEvent', 'wxMenuEvent', 'wxMouseCaptureChangedEvent', 'wxMouseCaptureLostEvent', diff --git a/src/event_ex.py b/src/event_ex.py index 01ab19cb..521e777b 100644 --- a/src/event_ex.py +++ b/src/event_ex.py @@ -217,8 +217,9 @@ EVT_TWO_FINGER_TAP = wx.PyEventBinder( wxEVT_TWO_FINGER_TAP ) EVT_LONG_PRESS = wx.PyEventBinder( wxEVT_LONG_PRESS ) EVT_PRESS_AND_TAP = wx.PyEventBinder( wxEVT_PRESS_AND_TAP ) -EVT_CLIPBOARD_CHANGED = PyEventBinder(wxEVT_CLIPBOARD_CHANGED, 1) +EVT_CLIPBOARD_CHANGED = wx.PyEventBinder(wxEVT_CLIPBOARD_CHANGED, 1) +EVT_FULLSCREEN = wx.PyEventBinder(wxEVT_FULLSCREEN, 1) # deprecated wxEVT aliases wxEVT_COMMAND_BUTTON_CLICKED = wxEVT_BUTTON diff --git a/wscript b/wscript index 7fc4f7ca..9a54e329 100644 --- a/wscript +++ b/wscript @@ -253,12 +253,6 @@ def configure(conf): uselib_store='WXWEBVIEW', mandatory=True, msg='Finding libs for WXWEBVIEW') - if isDarwin: - conf.check_cfg(path=conf.options.wx_config, package='', - args='--cxxflags --libs core,net' + rpath, - uselib_store='WXWEBKIT', mandatory=True, - msg='Finding libs for WXWEBKIT') - conf.check_cfg(path=conf.options.wx_config, package='', args='--cxxflags --libs xml,core,net' + rpath, uselib_store='WXXML', mandatory=True, @@ -616,8 +610,6 @@ def build(bld): makeETGRule(bld, 'etg/_aui.py', '_aui', 'WXAUI') # Modules that are platform-specific - if isDarwin: - makeETGRule(bld, 'etg/_webkit.py', '_webkit', 'WXWEBKIT') if isWindows: makeETGRule(bld, 'etg/_msw.py', '_msw', 'WX')