Last missed patches.

Ignore-this: 14a684c8eda33fe3f77bd2af2bba6f72 Bump version dependencies on wxcore. Fix a some undefined event cases in eljevent.cpp. darcs-hash:20120403192212-75908-eba30ce450fca807feba7fa038f96205525aa3d3.gz
jodonoghue · Apr 3, 2012 · 854f623 · 854f623
1 parent e3fe73b
commit 854f623
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/wx/wx.cabal b/wx/wx.cabal
@@ -24,7 +24,7 @@ Flag newBase
 
 Library
     if flag(splitBase)
-        build-depends: wxcore >= 0.13.1,
+        build-depends: wxcore >= 0.15,
                        stm
         if flag(newBase)
             build-depends:
@@ -34,7 +34,7 @@ Library
                 base >= 3 && < 4
     else
         build-depends: base <  3, 
-                       wxcore >= 0.12.1.6,
+                       wxcore >= 0.15,
                        stm
 
  Exposed-Modules:
@@ -54,4 +54,5 @@ Library
   Graphics.UI.WX.Timer
   Graphics.UI.WX.Menu
   Graphics.UI.WX
+
  Hs-Source-Dirs: src
diff --git a/wxc/src/cpp/eljevent.cpp b/wxc/src/cpp/eljevent.cpp
@@ -1066,8 +1066,12 @@ EWXWEXPORT(bool,wxPropertyGridEvent_HasProperty)(wxPropertyGridEvent* self)
 
 EWXWEXPORT(wxPGProperty*,wxPropertyGridEvent_GetProperty)(wxPropertyGridEvent* self)
 {
+#if defined(wxUSE_PROPGRID)
         wxPGProperty* const prop = self->GetProperty();
         return prop == 0 ? new wxPGProperty() : prop;
+#else
+        return NULL;
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1109,6 +1113,38 @@ MAKE_EVENT_WRAPPER(EVT_AUI_PANE_MAXIMIZE)
 MAKE_EVENT_WRAPPER(EVT_AUI_PANE_RESTORE)
 MAKE_EVENT_WRAPPER(EVT_AUI_RENDER)
 MAKE_EVENT_WRAPPER(EVT_AUI_FIND_MANAGER)
+#else
+// from aui/auibar.h
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUITOOLBAR_RIGHT_CLICK)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUITOOLBAR_BEGIN_DRAG)
+
+// from aui/auibook.h
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_BUTTON)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_END_DRAG)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_DRAG_MOTION)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_ALLOW_DND)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_DRAG_DONE)
+MAKE_UNDEFEVENT_WRAPPER(EVT_COMMAND_AUINOTEBOOK_BG_DCLICK)
+
+// from aui/framemanager.h
+MAKE_UNDEFEVENT_WRAPPER(EVT_AUI_PANE_BUTTON)
+MAKE_UNDEFEVENT_WRAPPER(EVT_AUI_PANE_CLOSE)
+MAKE_UNDEFEVENT_WRAPPER(EVT_AUI_PANE_MAXIMIZE)
+MAKE_UNDEFEVENT_WRAPPER(EVT_AUI_PANE_RESTORE)
+MAKE_UNDEFEVENT_WRAPPER(EVT_AUI_RENDER)
+MAKE_UNDEFEVENT_WRAPPER(EVT_AUI_FIND_MANAGER)
 #endif // wxUSE_AUI
 
 // from calctrl.h