wx: Fixes more changed/removed functionality in 2.9

3 files changed, 19 insertions, 6 deletions

diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index eb7a892f64..ced9c965ff 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -838,8 +838,8 @@ call_arg(#param{name=N,type={merged,_,#type{base={class,_},single=true,
 					    ref=Ref},_,_,_,_}})
   when ByVal =:= true; Ref =:= reference ->
     "*" ++ N;
-call_arg(#param{def=Def, type=void}) when Def =/= none -> Def;
-call_arg(#param{def=Def, type=voidp}) when Def =/= none -> Def;
+call_arg(#param{def=Def, type=void}) when Def =/= none  -> Def;
+call_arg(#param{def=Def, type=voidp}) when Def =/= none -> "(void **) " ++ Def;
 call_arg(#param{name=N,type=#type{base={ref,_},by_val=true,single=true}}) -> N;
 call_arg(#param{name=N,type={merged,_,_,_,_,_,_}}) -> N.
 
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index ca647c43ae..bb7732a140 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -279,7 +279,9 @@
 {class, wxGridCellEditor,   root, [], 
  ['Create',
   'IsCreated', 'SetSize', 'Show',
-  'PaintBackground', 'BeginEdit', {'EndEdit', [{ifdef, "!wxCHECK_VERSION(2,9,0)"}]},
+  {'PaintBackground', [{ifdef, "!wxCHECK_VERSION(2,9,0)"}]},
+  'BeginEdit',
+  {'EndEdit', [{ifdef, "!wxCHECK_VERSION(2,9,0)"}]},
   'Reset', 'StartingKey',
   'StartingClick', 'HandleReturn'
   %'Destroy','Clone','~wxGridCellEditor',
@@ -405,7 +407,9 @@
  ['GetDefaultRenderer','CreateContext',
   %%'CreateContextFromNativeContext', 'CreateContextFromNativeWindow',
   'CreatePen','CreateBrush',
-  'CreateLinearGradientBrush','CreateRadialGradientBrush','CreateFont',
+  {'CreateLinearGradientBrush', [{ifdef, "!wxCHECK_VERSION(2,9,0)"}]},
+  {'CreateRadialGradientBrush', [{ifdef, "!wxCHECK_VERSION(2,9,0)"}]},
+  'CreateFont',
   'CreateMatrix','CreatePath']}.
 
 {class, wxGraphicsPen,  wxGraphicsObject,[{ifdef, wxUSE_GRAPHICS_CONTEXT}], []}.
@@ -708,7 +712,8 @@
 
 {class, wxCalendarCtrl, wxControl, [], 
  ['wxCalendarCtrl','Create','~wxCalendarCtrl','SetDate','GetDate',
-  'EnableYearChange','EnableMonthChange','EnableHolidayDisplay',
+  {'EnableYearChange', [{ifdef, "!wxCHECK_VERSION(2,9,0)"}]}, %% Temp bug in wx I assume
+  'EnableMonthChange','EnableHolidayDisplay',
   'SetHeaderColours','GetHeaderColourFg','GetHeaderColourBg',
   'SetHighlightColours','GetHighlightColourFg','GetHighlightColourBg',
   'SetHolidayColours','GetHolidayColourFg','GetHolidayColourBg',
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index a7ef71e179..1aa25ff7b4 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -4402,6 +4402,7 @@ attr = (wxGridCellAttr *) getPtr(bp,memenv); bp += 4;
  This->Show((bool) *show,attr);
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxGridCellEditor_PaintBackground: { // wxGridCellEditor::PaintBackground
  wxGridCellEditor *This = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  int * rectCellX = (int *) bp; bp += 4;
@@ -4414,6 +4415,7 @@ case wxGridCellEditor_PaintBackground: { // wxGridCellEditor::PaintBackground
  This->PaintBackground(rectCell,attr);
  break;
 }
+#endif
 case wxGridCellEditor_BeginEdit: { // wxGridCellEditor::BeginEdit
  wxGridCellEditor *This = (wxGridCellEditor *) getPtr(bp,memenv); bp += 4;
  int * row = (int *) bp; bp += 4;
@@ -6948,6 +6950,7 @@ case wxGraphicsRenderer_CreateBrush: { // wxGraphicsRenderer::CreateBrush
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxGraphicsRenderer_CreateLinearGradientBrush: { // wxGraphicsRenderer::CreateLinearGradientBrush
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -6970,6 +6973,8 @@ case wxGraphicsRenderer_CreateLinearGradientBrush: { // wxGraphicsRenderer::Crea
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#endif
+#if !wxCHECK_VERSION(2,9,0)
 case wxGraphicsRenderer_CreateRadialGradientBrush: { // wxGraphicsRenderer::CreateRadialGradientBrush
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
  bp += 4; /* Align */
@@ -6993,6 +6998,7 @@ case wxGraphicsRenderer_CreateRadialGradientBrush: { // wxGraphicsRenderer::Crea
  rt.addRef(getRef((void *)Result,memenv), "wxGraphicsBrush");
  break;
 }
+#endif
 case wxGraphicsRenderer_CreateFont: { // wxGraphicsRenderer::CreateFont
  wxColour col= *wxBLACK;
  wxGraphicsRenderer *This = (wxGraphicsRenderer *) getPtr(bp,memenv); bp += 4;
@@ -13547,6 +13553,7 @@ case wxCalendarCtrl_GetDate: { // wxCalendarCtrl::GetDate
  rt.add((*Result));
  break;
 }
+#if !wxCHECK_VERSION(2,9,0)
 case wxCalendarCtrl_EnableYearChange: { // wxCalendarCtrl::EnableYearChange
  bool enable=true;
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
@@ -13560,6 +13567,7 @@ case wxCalendarCtrl_EnableYearChange: { // wxCalendarCtrl::EnableYearChange
  This->EnableYearChange(enable);
  break;
 }
+#endif
 case wxCalendarCtrl_EnableMonthChange: { // wxCalendarCtrl::EnableMonthChange
  bool enable=true;
  wxCalendarCtrl *This = (wxCalendarCtrl *) getPtr(bp,memenv); bp += 4;
@@ -15114,7 +15122,7 @@ case wxListBox_Set: { // wxListBox::Set
  }
  bp += (8-((0+ itemsASz) & 7 )) & 7;
  if(!This) throw wxe_badarg(0);
- This->Set(items,NULL);
+ This->Set(items,(void **) NULL);
  break;
 }
 case wxListBox_HitTest: { // wxListBox::HitTest