diff options
| author | Dan Gudmundsson <[email protected]> | 2012-10-25 11:55:21 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-01-09 11:41:40 +0100 |
| commit | c6b6e6b67a7b9f8e0e25385c2272327d9a706348 (patch) | |
| tree | db52b5ee07677d2320b8e4463b6921e159e62452 /lib/wx/api_gen | |
| parent | 0d2d008ecfc8e2f5c5d14ff38bf8da0d28a3fdb4 (diff) | |
| download | otp-c6b6e6b67a7b9f8e0e25385c2272327d9a706348.tar.gz otp-c6b6e6b67a7b9f8e0e25385c2272327d9a706348.tar.bz2 otp-c6b6e6b67a7b9f8e0e25385c2272327d9a706348.zip | |
wx: Fixes more changed/removed functionality in 2.9
Diffstat (limited to 'lib/wx/api_gen')
| -rw-r--r-- | lib/wx/api_gen/wx_gen_cpp.erl | 4 | ||||
| -rw-r--r-- | lib/wx/api_gen/wxapi.conf | 11 |
2 files changed, 10 insertions, 5 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', |