diff options
Diffstat (limited to 'lib/wx/api_gen/wxapi.conf')
| -rw-r--r-- | lib/wx/api_gen/wxapi.conf | 68 |
1 files changed, 45 insertions, 23 deletions
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf index ff618faf04..1f6225ce60 100644 --- a/lib/wx/api_gen/wxapi.conf +++ b/lib/wx/api_gen/wxapi.conf @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2011. All Rights Reserved. +%% Copyright Ericsson AB 2008-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -330,9 +330,11 @@ {'DrawRotatedText',3}, 'DrawRoundedRectangle',%'DrawSpline', {'DrawText',2}, 'EndDoc','EndPage',{'FloodFill',3},'GetBackground','GetBackgroundMode', - 'GetBrush','GetCharHeight','GetCharWidth',{'GetClippingBox',1},'GetFont', - 'GetLayoutDirection','GetLogicalFunction','GetMapMode','GetMultiLineTextExtent', - 'GetPartialTextExtents','GetPen',{'GetPixel',2},'GetPPI','GetSize','GetSizeMM', + 'GetBrush','GetCharHeight','GetCharWidth',{'GetClippingBox',[{"rect", skip_member}]}, + 'GetFont','GetLayoutDirection','GetLogicalFunction','GetMapMode','GetMultiLineTextExtent', + {'GetPartialTextExtents', [{"widths", out}]}, + 'GetPen',{'GetPixel', [{"col", out}, {"x", skip_member}]}, + 'GetPPI','GetSize','GetSizeMM', 'GetTextBackground','GetTextExtent','GetTextForeground', 'GetUserScale','GradientFillConcentric','GradientFillLinear', 'LogicalToDeviceX','LogicalToDeviceXRel','LogicalToDeviceY','LogicalToDeviceYRel', @@ -355,20 +357,28 @@ %%{class,wxAutoBufferedPaintDC,wxBufferedPaintDC,[],['wxAutoBufferedPaintDC']}. {class, wxGraphicsObject, object, [{ifdef, wxUSE_GRAPHICS_CONTEXT}], - ['GetRenderer','IsNull']}. -{class, wxGraphicsContext, wxGraphicsObject, [{ifdef, wxUSE_GRAPHICS_CONTEXT}], - ['Create', %%CreateFromNative CreateFromNativeWindow + ['~wxGraphicsObject', 'GetRenderer','IsNull']}. +{class, wxGraphicsContext, wxGraphicsObject, + [{ifdef, wxUSE_GRAPHICS_CONTEXT}, {skip, [{'StrokeLines',4}]}], + ['~wxGraphicsContext', + 'Create', %%CreateFromNative CreateFromNativeWindow 'CreatePen','CreateBrush','CreateRadialGradientBrush', 'CreateLinearGradientBrush','CreateFont','CreateMatrix', 'CreatePath','Clip','ResetClip', - 'DrawBitmap','DrawEllipse','DrawIcon','DrawLines','DrawPath', + 'DrawBitmap','DrawEllipse','DrawIcon', + {'DrawLines', [{"n",{c_only,{length,"points"}}}, {"points", {single,array}}]}, + 'DrawPath', 'DrawRectangle','DrawRoundedRectangle','DrawText','FillPath', - 'StrokePath','GetNativeContext','GetPartialTextExtents', + 'StrokePath', %% 'GetNativeContext', + {'GetPartialTextExtents', [{"widths", out}]}, 'GetTextExtent','Rotate','Scale','Translate', 'GetTransform','SetTransform','ConcatTransform', - 'SetBrush','SetFont','SetPen','StrokeLine','StrokeLines']}. + 'SetBrush','SetFont','SetPen','StrokeLine', + {'StrokeLines', [{"n",{c_only,{length,"points"}}}, {"points", {single,array}}]} + ]}. {class, wxGraphicsMatrix, wxGraphicsObject, [{ifdef, wxUSE_GRAPHICS_CONTEXT}], - ['Concat','Get','GetNativeMatrix','Invert','IsEqual','IsIdentity', + ['Concat','Get',%%'GetNativeMatrix', + 'Invert','IsEqual','IsIdentity', 'Rotate','Scale','Translate','Set','TransformPoint','TransformDistance']}. {class, wxGraphicsPath, wxGraphicsObject, [{ifdef, wxUSE_GRAPHICS_CONTEXT}], ['MoveToPoint','AddArc','AddArcToPoint','AddCircle','AddCurveToPoint', @@ -400,17 +410,17 @@ {class, wxControl, wxWindow, [], [% 'Command','GetLabelText', 'GetLabel','SetLabel']}. -{class, wxControlWithItems, wxControl, - [{skip, [{'GetClientObject',1},{'SetClientObject',2}]}], +{class, wxControlWithItems, wxControl, + [{skip, [{'GetClientObject',1},{'SetClientObject',2}]}], [ - {'Append',[{"clientData",[{skip_member, void}]}, - {"strings", [{erl_func, "appendStrings"}]}]}, + {'Append',[{"clientData",[{skip_member, voidp}]}, + {"strings", [{erl_func, "appendStrings"}]}]}, 'Clear','Delete','FindString', %% 'GetClientData','SetClientData', {'GetClientObject', [{"n", [{erl_func, "getClientData"}]}]}, {'SetClientObject', [{"n", [{erl_func, "setClientData"}]}]}, 'GetCount','GetSelection','GetString','GetStringSelection', - {'Insert',[{"clientData",[{skip_member, void}]}]},%'Number', + {'Insert',[{"clientData",[{skip_member, voidp}]}]},%'Number', 'IsEmpty','Select','SetSelection','SetString','SetStringSelection' ]}. @@ -766,10 +776,12 @@ 'GetEditControl', 'GetImageList','GetItem','GetItemBackgroundColour', 'GetItemCount',{'GetItemData', [{return, {base,int}}]}, - 'GetItemFont','GetItemPosition','GetItemRect', - 'GetItemSpacing','GetItemState','GetItemText','GetItemTextColour', + 'GetItemFont', {'GetItemPosition', [{"pos", out}]},{'GetItemRect',[{"rect", out}]}, + 'GetItemSpacing','GetItemState', + 'GetItemText','GetItemTextColour', 'GetNextItem','GetSelectedItemCount','GetTextColour','GetTopItem', - 'GetViewRect',{'HitTest',[{"pSubItem",nowhere}]},'InsertColumn','InsertItem', + 'GetViewRect',{'HitTest',[{"pSubItem",nowhere}, {"flags", in}]}, + 'InsertColumn','InsertItem', %%'OnGetItemAttr', 'OnGetItemImage','OnGetItemText', 'RefreshItem','RefreshItems','ScrollList', 'SetBackgroundColour','SetColumn','SetColumnWidth','SetImageList','SetItem', @@ -1592,9 +1604,9 @@ 'HomeWrapExtend', 'LineEndWrap', 'LineEndWrapExtend', 'VCHomeWrap', 'VCHomeWrapExtend', 'LineCopy', 'MoveCaretInsideView', 'LineLength', 'BraceHighlight', 'BraceBadLight', 'BraceMatch', 'GetViewEOL', 'SetViewEOL', %'GetDocPointer', 'SetDocPointer', Hmm void pointers - 'SetModEventMask', 'GetEdgeColumn', 'SetEdgeColumn', - 'GetEdgeMode', 'GetEdgeColour', 'SetEdgeColour', 'SearchAnchor', 'SearchNext', - 'SearchPrev', 'LinesOnScreen', + 'SetModEventMask', 'GetEdgeColumn', 'SetEdgeColumn', + 'SetEdgeMode', 'GetEdgeMode', 'GetEdgeColour', 'SetEdgeColour', 'SearchAnchor', 'SearchNext', + 'SearchPrev', 'LinesOnScreen', 'UsePopUp', 'SelectionIsRectangle', 'SetZoom', 'GetZoom', %%'CreateDocument', 'AddRefDocument', 'ReleaseDocument', Hmm void pointers 'GetModEventMask', 'SetSTCFocus', 'GetSTCFocus', 'SetStatus', 'GetStatus', @@ -1803,4 +1815,14 @@ {class, wxLogNull, root, [], [wxLogNull, '~wxLogNull']}. - + +{class, wxTaskBarIcon, wxEvtHandler, [], + [wxTaskBarIcon,'~wxTaskBarIcon', + %%'CreatePopupMenu', virtual overrided is a callback + %% 'IsIconInstalled', 'IsOk', not available on mac + 'PopupMenu','RemoveIcon','SetIcon']}. + +{class, wxTaskBarIconEvent, wxEvent, + [{event,[wxEVT_TASKBAR_MOVE,wxEVT_TASKBAR_LEFT_DOWN,wxEVT_TASKBAR_LEFT_UP, + wxEVT_TASKBAR_RIGHT_DOWN,wxEVT_TASKBAR_RIGHT_UP, + wxEVT_TASKBAR_LEFT_DCLICK,wxEVT_TASKBAR_RIGHT_DCLICK]}],[]}. |