diff options
| author | Dan Gudmundsson <[email protected]> | 2012-12-13 10:54:12 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-01-09 11:44:27 +0100 |
| commit | c8b4d62cf92b3e0662adfb9e6a5d80d516413cde (patch) | |
| tree | 0d244c8f2fdf2230e434b8140d2fa6cdb0b7d286 /lib/wx/api_gen/wxapi.conf | |
| parent | 7771a19fa7e65b866a5c6a922adc636c1ec45a51 (diff) | |
| download | otp-c8b4d62cf92b3e0662adfb9e6a5d80d516413cde.tar.gz otp-c8b4d62cf92b3e0662adfb9e6a5d80d516413cde.tar.bz2 otp-c8b4d62cf92b3e0662adfb9e6a5d80d516413cde.zip | |
wx: Fix changed getfunctions
wx-2.9 have changed some functions from returning references to objects to
returning objects instead
Diffstat (limited to 'lib/wx/api_gen/wxapi.conf')
| -rw-r--r-- | lib/wx/api_gen/wxapi.conf | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf index 4610f80234..94142ff6ba 100644 --- a/lib/wx/api_gen/wxapi.conf +++ b/lib/wx/api_gen/wxapi.conf @@ -148,7 +148,8 @@ {class, wxTopLevelWindowGTK, wxWindow, [{alias, [{wxTopLevelWindowGTK, wxTopLevelWindow}]}], - ['GetIcon','GetIcons','GetTitle','IsActive','Iconize', + [{'GetIcon', [{return, {by_val, true}}]}, + 'GetIcons','GetTitle','IsActive','Iconize', 'IsFullScreen','IsIconized','IsMaximized','Maximize', 'RequestUserAttention','SetIcon','SetIcons', 'CenterOnScreen', 'CentreOnScreen', @@ -532,8 +533,7 @@ {class, wxIconBundle, root, [], ['wxIconBundle','~wxIconBundle','AddIcon', - 'GetIcon']}. -%% {'GetIcon', [{return, {by_val, true}}]}]}. + {'GetIcon', [{return, {by_val, true}}]}]}. {class, wxCursor, wxBitmap,[], [{'wxCursor',[{{func, 5}, [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}, @@ -615,11 +615,14 @@ 'SetRGB']}. {class, wxBrush, object, [], - ['wxBrush','~wxBrush','GetColour','GetStipple','GetStyle', + ['wxBrush','~wxBrush', + {'GetColour', [{return, {by_val, true}}]}, + 'GetStipple','GetStyle', 'IsHatch','IsOk','SetColour','SetStipple','SetStyle']}. {class, wxPen, object, [], - ['wxPen','~wxPen','GetCap','GetColour', + ['wxPen','~wxPen','GetCap', + {'GetColour', [{return, {by_val, true}}]}, %%'GetDashes', %'GetStipple', 'GetJoin', 'GetStyle','GetWidth','IsOk', {'SetCap', [{"capStyle", [{base, {enum, "wxPenCap"}}]}]}, @@ -724,8 +727,11 @@ ['wxButton','~wxButton','Create',%'GetLabel', 'GetDefaultSize', 'SetDefault','SetLabel']}. {class, wxBitmapButton, wxButton, [], - ['wxBitmapButton','~wxBitmapButton','Create','GetBitmapDisabled', - 'GetBitmapFocus','GetBitmapLabel','GetBitmapSelected', + ['wxBitmapButton','~wxBitmapButton','Create', + {'GetBitmapDisabled', [{return, {by_val, true}}]}, + {'GetBitmapFocus', [{return, {by_val, true}}]}, + {'GetBitmapLabel', [{return, {by_val, true}}]}, + {'GetBitmapSelected', [{return, {by_val, true}}]}, 'SetBitmapDisabled','SetBitmapFocus','SetBitmapLabel','SetBitmapSelected']}. {class, wxToggleButton, wxControl, [], ['wxToggleButton','~wxToggleButton','Create','GetValue','SetValue']}. @@ -734,7 +740,8 @@ {class, wxDateTime, root, [ignore], []}. %% Only for ifdefs and enums {class, wxCalendarCtrl, wxControl, [], - ['wxCalendarCtrl','Create','~wxCalendarCtrl','SetDate','GetDate', + ['wxCalendarCtrl','Create','~wxCalendarCtrl','SetDate', + {'GetDate', [{return, {by_val, true}}]}, {'EnableYearChange', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}, %% Temp bug in wx I assume 'EnableMonthChange','EnableHolidayDisplay', 'SetHeaderColours','GetHeaderColourFg','GetHeaderColourBg', @@ -858,8 +865,9 @@ {enum, wxTextAttrAlignment, "wxTEXT_ALIGNMENT_"}. {class, wxTextAttr, root, [], - ['wxTextAttr','GetAlignment','GetBackgroundColour','GetFont','GetLeftIndent', - 'GetLeftSubIndent','GetRightIndent','GetTabs','GetTextColour', + ['wxTextAttr','GetAlignment','GetBackgroundColour', + {'GetFont', [{return, {by_val, true}}]}, + 'GetLeftIndent','GetLeftSubIndent','GetRightIndent','GetTabs','GetTextColour', 'HasBackgroundColour','HasFont','HasTextColour','GetFlags','IsDefault', 'SetAlignment','SetBackgroundColour','SetFlags','SetFont','SetLeftIndent', 'SetRightIndent','SetTabs','SetTextColour']}. |