From c6b6e6b67a7b9f8e0e25385c2272327d9a706348 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Thu, 25 Oct 2012 11:55:21 +0200
Subject: wx: Fixes more changed/removed functionality in 2.9

---
 lib/wx/api_gen/wx_gen_cpp.erl |  4 ++--
 lib/wx/api_gen/wxapi.conf     | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'lib/wx/api_gen')

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',
-- 
cgit v1.2.3