Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed wxc build.

Ignore-this: 305cffb93b886526562b24ed85af3cfb

Removed problematic WebKit events (based on Eric Kow, Nov 3rd 2011)
Fixed merge error in Setup.hs using the '-undefined' linker flag on OS X.

darcs-hash:20120314230034-75908-f67f5c3fe61e328860df4a98ad4ca89171fb2ca5.gz
  • Loading branch information...
commit b00002c3664b8aa28eb04f3f7cf9a87e78e43876 1 parent e3be4b4
Jeremy O'Donoghue authored
Showing with 11 additions and 28 deletions.
  1. +1 −1  wxc/Setup.hs
  2. +10 −27 wxc/src/cpp/eljevent.cpp
2  wxc/Setup.hs
View
@@ -168,7 +168,7 @@ linkCxxOpts ver out_dir basename =
"-Wl,--export-all-symbols", "-Wl,--enable-auto-import"]
OSX -> ["-dynamiclib",
"-o " ++ out_dir </> sharedLibName ver basename,
- "-Wl,undefined,dynamic_lookup"]
+ "-Wl,-undefined,dynamic_lookup"]
_ -> ["-shared",
"-Wl,-soname,lib" ++ basename ++ ".so",
"-o " ++ out_dir </> sharedLibName ver basename]
37 wxc/src/cpp/eljevent.cpp
View
@@ -1,9 +1,6 @@
#include "wrapper.h"
#include "wx/process.h"
#include "wx/dialup.h"
-#if (wxVERSION_NUMBER < 2900)
-# include "wx/tabctrl.h"
-#endif
#include "wx/power.h"
@@ -26,36 +23,29 @@
#include "wx/collpane.h"
#include "wx/dataview.h"
#include "wx/fdrepdlg.h"
-#if (wxVERSION_NUMBER >= 2900)
-# include "wx/filectrl.h"
-#endif
+#include "wx/filectrl.h"
#include "wx/filepicker.h"
#include "wx/fontpicker.h"
-#if (wxVERSION_NUMBER >= 2900)
-# include "wx/fswatcher.h"
-# include "wx/headerctrl.h"
-#endif
+#include "wx/fswatcher.h"
+#include "wx/headerctrl.h"
#include "wx/hyperlink.h"
#include "wx/listbook.h"
#include "wx/mediactrl.h"
-#if (wxVERSION_NUMBER >= 2900)
-# include "wx/propgrid/propgrid.h"
-# include "wx/ribbon/bar.h"
-# include "wx/ribbon/buttonbar.h"
-# include "wx/ribbon/gallery.h"
-# include "wx/ribbon/toolbar.h"
-#endif
+#include "wx/propgrid/propgrid.h"
+#include "wx/ribbon/bar.h"
+#include "wx/ribbon/buttonbar.h"
+#include "wx/ribbon/gallery.h"
+#include "wx/ribbon/toolbar.h"
#include "wx/richtext/richtextctrl.h"
#include "wx/srchctrl.h"
-#if (wxVERSION_NUMBER >= 2900)
-# include "wx/stc/stc.h"
-#endif
+#include "wx/stc/stc.h"
#include "wx/taskbar.h"
#include "wx/textctrl.h"
#include "wx/tglbtn.h"
#include "wx/toolbook.h"
#include "wx/treebook.h"
+
extern "C"
{
@@ -1485,13 +1475,6 @@ MAKE_EVENT_WRAPPER(EVT_COMMAND_HTML_CELL_HOVER)
MAKE_EVENT_WRAPPER(EVT_COMMAND_HTML_LINK_CLICKED)
#endif
-// from html/webkit.h
-#if wxUSE_WEBKIT
-MAKE_EVENT_WRAPPER(EVT_WEBKIT_STATE_CHANGED)
-MAKE_EVENT_WRAPPER(EVT_WEBKIT_BEFORE_LOAD)
-MAKE_EVENT_WRAPPER(EVT_WEBKIT_NEW_WINDOW)
-#endif
-
// from hyperlink.h
#if wxUSE_HYPERLINKCTRL
MAKE_EVENT_WRAPPER(EVT_COMMAND_HYPERLINK)
Please sign in to comment.
Something went wrong with that request. Please try again.