diff options
| author | Dan Gudmundsson <[email protected]> | 2012-02-21 16:05:37 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-02-22 09:41:06 +0100 |
| commit | 217343d158afe60a5a6a15e8b894b6fd62611ad3 (patch) | |
| tree | fcc6d24f7fae59e455ffbb0b2931349a63d3c599 /lib/wx/src | |
| parent | 2c95eb0c575c95a2cdf3c2eacb562d1a5a8cfe08 (diff) | |
| download | otp-217343d158afe60a5a6a15e8b894b6fd62611ad3.tar.gz otp-217343d158afe60a5a6a15e8b894b6fd62611ad3.tar.bz2 otp-217343d158afe60a5a6a15e8b894b6fd62611ad3.zip | |
[wx] Fix spec errors
Diffstat (limited to 'lib/wx/src')
156 files changed, 776 insertions, 773 deletions
diff --git a/lib/wx/src/gen/wxAcceleratorEntry.erl b/lib/wx/src/gen/wxAcceleratorEntry.erl index 6185a1891b..b5467ecab8 100644 --- a/lib/wx/src/gen/wxAcceleratorEntry.erl +++ b/lib/wx/src/gen/wxAcceleratorEntry.erl @@ -109,7 +109,7 @@ set(#wx_ref{type=ThisT,ref=ThisRef},Flags,KeyCode,Cmd, Options) <<ThisRef:32/?UI,Flags:32/?UI,KeyCode:32/?UI,Cmd:32/?UI, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxAcceleratorEntry) -> ok. +-spec destroy(This::wxAcceleratorEntry()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxAcceleratorEntry), wxe_util:destroy(?wxAcceleratorEntry_destroy,Obj), diff --git a/lib/wx/src/gen/wxAcceleratorTable.erl b/lib/wx/src/gen/wxAcceleratorTable.erl index 15915daa5a..1b58cf3826 100644 --- a/lib/wx/src/gen/wxAcceleratorTable.erl +++ b/lib/wx/src/gen/wxAcceleratorTable.erl @@ -59,7 +59,7 @@ ok(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxAcceleratorTable) -> ok. +-spec destroy(This::wxAcceleratorTable()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxAcceleratorTable), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxArtProvider.erl b/lib/wx/src/gen/wxArtProvider.erl index 584e240879..1515c46f9f 100644 --- a/lib/wx/src/gen/wxArtProvider.erl +++ b/lib/wx/src/gen/wxArtProvider.erl @@ -36,7 +36,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxArtProvider() :: wx:wx_object(). %% @equiv getBitmap(Id, []) -spec getBitmap(Id) -> wxBitmap:wxBitmap() when - Id::string(). + Id::unicode:chardata(). getBitmap(Id) when is_list(Id) -> @@ -44,8 +44,8 @@ getBitmap(Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxartprovider.html#wxartprovidergetbitmap">external documentation</a>. -spec getBitmap(Id, [Option]) -> wxBitmap:wxBitmap() when - Id::string(), - Option :: {client, string()} + Id::unicode:chardata(), + Option :: {client, unicode:chardata()} | {size, {W::integer(), H::integer()}}. getBitmap(Id, Options) when is_list(Id),is_list(Options) -> @@ -59,7 +59,7 @@ getBitmap(Id, Options) %% @equiv getIcon(Id, []) -spec getIcon(Id) -> wxIcon:wxIcon() when - Id::string(). + Id::unicode:chardata(). getIcon(Id) when is_list(Id) -> @@ -67,8 +67,8 @@ getIcon(Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxartprovider.html#wxartprovidergeticon">external documentation</a>. -spec getIcon(Id, [Option]) -> wxIcon:wxIcon() when - Id::string(), - Option :: {client, string()} + Id::unicode:chardata(), + Option :: {client, unicode:chardata()} | {size, {W::integer(), H::integer()}}. getIcon(Id, Options) when is_list(Id),is_list(Options) -> diff --git a/lib/wx/src/gen/wxAuiManager.erl b/lib/wx/src/gen/wxAuiManager.erl index 4d2d2bdc78..8a0a64f346 100644 --- a/lib/wx/src/gen/wxAuiManager.erl +++ b/lib/wx/src/gen/wxAuiManager.erl @@ -74,7 +74,7 @@ addPane(This,Window) -spec addPane(This, Window, [Option]) -> boolean() when This::wxAuiManager(), Window::wxWindow:wxWindow(), Option :: {direction, integer()} - | {caption, string()}; + | {caption, unicode:chardata()}; (This, Window, Pane_info) -> boolean() when This::wxAuiManager(), Window::wxWindow:wxWindow(), Pane_info::wxAuiPaneInfo:wxAuiPaneInfo(). addPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Options) @@ -164,7 +164,7 @@ getManager(#wx_ref{type=WindowT,ref=WindowRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetpane">external documentation</a>. -spec getPane(This, Name) -> wxAuiPaneInfo:wxAuiPaneInfo() when - This::wxAuiManager(), Name::string(); + This::wxAuiManager(), Name::unicode:chardata(); (This, Window) -> wxAuiPaneInfo:wxAuiPaneInfo() when This::wxAuiManager(), Window::wxWindow:wxWindow(). getPane(#wx_ref{type=ThisT,ref=ThisRef},Name) @@ -212,7 +212,7 @@ insertPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},# %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerloadpaneinfo">external documentation</a>. -spec loadPaneInfo(This, Pane_part, Pane) -> ok when - This::wxAuiManager(), Pane_part::string(), Pane::wxAuiPaneInfo:wxAuiPaneInfo(). + This::wxAuiManager(), Pane_part::unicode:chardata(), Pane::wxAuiPaneInfo:wxAuiPaneInfo(). loadPaneInfo(#wx_ref{type=ThisT,ref=ThisRef},Pane_part,#wx_ref{type=PaneT,ref=PaneRef}) when is_list(Pane_part) -> ?CLASS(ThisT,wxAuiManager), @@ -223,7 +223,7 @@ loadPaneInfo(#wx_ref{type=ThisT,ref=ThisRef},Pane_part,#wx_ref{type=PaneT,ref=Pa %% @equiv loadPerspective(This,Perspective, []) -spec loadPerspective(This, Perspective) -> boolean() when - This::wxAuiManager(), Perspective::string(). + This::wxAuiManager(), Perspective::unicode:chardata(). loadPerspective(This,Perspective) when is_record(This, wx_ref),is_list(Perspective) -> @@ -231,7 +231,7 @@ loadPerspective(This,Perspective) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerloadperspective">external documentation</a>. -spec loadPerspective(This, Perspective, [Option]) -> boolean() when - This::wxAuiManager(), Perspective::string(), + This::wxAuiManager(), Perspective::unicode:chardata(), Option :: {update, boolean()}. loadPerspective(#wx_ref{type=ThisT,ref=ThisRef},Perspective, Options) when is_list(Perspective),is_list(Options) -> @@ -244,7 +244,7 @@ loadPerspective(#wx_ref{type=ThisT,ref=ThisRef},Perspective, Options) <<ThisRef:32/?UI,(byte_size(Perspective_UC)):32/?UI,(Perspective_UC)/binary, 0:(((8- ((0+byte_size(Perspective_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersavepaneinfo">external documentation</a>. --spec savePaneInfo(This, Pane) -> string() when +-spec savePaneInfo(This, Pane) -> unicode:charlist() when This::wxAuiManager(), Pane::wxAuiPaneInfo:wxAuiPaneInfo(). savePaneInfo(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaneT,ref=PaneRef}) -> ?CLASS(ThisT,wxAuiManager), @@ -253,7 +253,7 @@ savePaneInfo(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaneT,ref=PaneRef}) -> <<ThisRef:32/?UI,PaneRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersaveperspective">external documentation</a>. --spec savePerspective(This) -> string() when +-spec savePerspective(This) -> unicode:charlist() when This::wxAuiManager(). savePerspective(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxAuiManager), @@ -322,7 +322,7 @@ update(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxAuiManager) -> ok. +-spec destroy(This::wxAuiManager()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxAuiManager), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxAuiNotebook.erl b/lib/wx/src/gen/wxAuiNotebook.erl index 6741feccb9..afb599738f 100644 --- a/lib/wx/src/gen/wxAuiNotebook.erl +++ b/lib/wx/src/gen/wxAuiNotebook.erl @@ -116,7 +116,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options) %% @equiv addPage(This,Page,Caption, []) -spec addPage(This, Page, Caption) -> boolean() when - This::wxAuiNotebook(), Page::wxWindow:wxWindow(), Caption::string(). + This::wxAuiNotebook(), Page::wxWindow:wxWindow(), Caption::unicode:chardata(). addPage(This,Page,Caption) when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Caption) -> @@ -124,7 +124,7 @@ addPage(This,Page,Caption) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookaddpage">external documentation</a>. -spec addPage(This, Page, Caption, [Option]) -> boolean() when - This::wxAuiNotebook(), Page::wxWindow:wxWindow(), Caption::string(), + This::wxAuiNotebook(), Page::wxWindow:wxWindow(), Caption::unicode:chardata(), Option :: {select, boolean()} | {bitmap, wxBitmap:wxBitmap()}. addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Caption, Options) @@ -220,7 +220,7 @@ getPageIndex(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Page_wndT,ref=Page_wnd <<ThisRef:32/?UI,Page_wndRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpagetext">external documentation</a>. --spec getPageText(This, Page_idx) -> string() when +-spec getPageText(This, Page_idx) -> unicode:charlist() when This::wxAuiNotebook(), Page_idx::integer(). getPageText(#wx_ref{type=ThisT,ref=ThisRef},Page_idx) when is_integer(Page_idx) -> @@ -238,7 +238,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @equiv insertPage(This,Page_idx,Page,Caption, []) -spec insertPage(This, Page_idx, Page, Caption) -> boolean() when - This::wxAuiNotebook(), Page_idx::integer(), Page::wxWindow:wxWindow(), Caption::string(). + This::wxAuiNotebook(), Page_idx::integer(), Page::wxWindow:wxWindow(), Caption::unicode:chardata(). insertPage(This,Page_idx,Page,Caption) when is_record(This, wx_ref),is_integer(Page_idx),is_record(Page, wx_ref),is_list(Caption) -> @@ -246,7 +246,7 @@ insertPage(This,Page_idx,Page,Caption) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookinsertpage">external documentation</a>. -spec insertPage(This, Page_idx, Page, Caption, [Option]) -> boolean() when - This::wxAuiNotebook(), Page_idx::integer(), Page::wxWindow:wxWindow(), Caption::string(), + This::wxAuiNotebook(), Page_idx::integer(), Page::wxWindow:wxWindow(), Caption::unicode:chardata(), Option :: {select, boolean()} | {bitmap, wxBitmap:wxBitmap()}. insertPage(#wx_ref{type=ThisT,ref=ThisRef},Page_idx,#wx_ref{type=PageT,ref=PageRef},Caption, Options) @@ -300,7 +300,7 @@ setPageBitmap(#wx_ref{type=ThisT,ref=ThisRef},Page,#wx_ref{type=BitmapT,ref=Bitm %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetpagetext">external documentation</a>. -spec setPageText(This, Page, Text) -> boolean() when - This::wxAuiNotebook(), Page::integer(), Text::string(). + This::wxAuiNotebook(), Page::integer(), Text::unicode:chardata(). setPageText(#wx_ref{type=ThisT,ref=ThisRef},Page,Text) when is_integer(Page),is_list(Text) -> ?CLASS(ThisT,wxAuiNotebook), @@ -336,7 +336,7 @@ setUniformBitmapSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH}) <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxAuiNotebook) -> ok. +-spec destroy(This::wxAuiNotebook()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxAuiNotebook), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxAuiPaneInfo.erl b/lib/wx/src/gen/wxAuiPaneInfo.erl index 47e86947d4..d59a8e8676 100644 --- a/lib/wx/src/gen/wxAuiPaneInfo.erl +++ b/lib/wx/src/gen/wxAuiPaneInfo.erl @@ -112,7 +112,7 @@ bottomDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfocaption">external documentation</a>. -spec caption(This, C) -> wxAuiPaneInfo() when - This::wxAuiPaneInfo(), C::string(). + This::wxAuiPaneInfo(), C::unicode:chardata(). caption(#wx_ref{type=ThisT,ref=ThisRef},C) when is_list(C) -> ?CLASS(ThisT,wxAuiPaneInfo), @@ -684,7 +684,7 @@ movable(#wx_ref{type=ThisT,ref=ThisRef}, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoname">external documentation</a>. -spec name(This, N) -> wxAuiPaneInfo() when - This::wxAuiPaneInfo(), N::string(). + This::wxAuiPaneInfo(), N::unicode:chardata(). name(#wx_ref{type=ThisT,ref=ThisRef},N) when is_list(N) -> ?CLASS(ThisT,wxAuiPaneInfo), @@ -888,7 +888,7 @@ window(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WT,ref=WRef}) -> <<ThisRef:32/?UI,WRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxAuiPaneInfo) -> ok. +-spec destroy(This::wxAuiPaneInfo()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxAuiPaneInfo), wxe_util:destroy(?wxAuiPaneInfo_destruct,Obj), diff --git a/lib/wx/src/gen/wxBitmap.erl b/lib/wx/src/gen/wxBitmap.erl index ac16700011..c363e22209 100644 --- a/lib/wx/src/gen/wxBitmap.erl +++ b/lib/wx/src/gen/wxBitmap.erl @@ -45,7 +45,7 @@ new() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>. -spec new(Filename) -> wxBitmap() when - Filename::string(); + Filename::unicode:chardata(); (Image) -> wxBitmap() when Image::wxImage:wxImage(). @@ -61,7 +61,7 @@ new(Image) -spec new(Width, Height) -> wxBitmap() when Width::integer(), Height::integer(); (Filename, [Option]) -> wxBitmap() when - Filename::string(), + Filename::unicode:chardata(), Option :: {type, wx:wx_enum()}; (Image, [Option]) -> wxBitmap() when Image::wxImage:wxImage(), @@ -207,7 +207,7 @@ getSubBitmap(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH}) %% @equiv loadFile(This,Name, []) -spec loadFile(This, Name) -> boolean() when - This::wxBitmap(), Name::string(). + This::wxBitmap(), Name::unicode:chardata(). loadFile(This,Name) when is_record(This, wx_ref),is_list(Name) -> @@ -216,7 +216,7 @@ loadFile(This,Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmaploadfile">external documentation</a>. %%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY -spec loadFile(This, Name, [Option]) -> boolean() when - This::wxBitmap(), Name::string(), + This::wxBitmap(), Name::unicode:chardata(), Option :: {type, wx:wx_enum()}. loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name, Options) when is_list(Name),is_list(Options) -> @@ -238,7 +238,7 @@ ok(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @equiv saveFile(This,Name,Type, []) -spec saveFile(This, Name, Type) -> boolean() when - This::wxBitmap(), Name::string(), Type::wx:wx_enum(). + This::wxBitmap(), Name::unicode:chardata(), Type::wx:wx_enum(). saveFile(This,Name,Type) when is_record(This, wx_ref),is_list(Name),is_integer(Type) -> @@ -247,7 +247,7 @@ saveFile(This,Name,Type) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsavefile">external documentation</a>. %%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY -spec saveFile(This, Name, Type, [Option]) -> boolean() when - This::wxBitmap(), Name::string(), Type::wx:wx_enum(), + This::wxBitmap(), Name::unicode:chardata(), Type::wx:wx_enum(), Option :: {palette, wxPalette:wxPalette()}. saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Type, Options) when is_list(Name),is_integer(Type),is_list(Options) -> @@ -305,7 +305,7 @@ setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width) <<ThisRef:32/?UI,Width:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxBitmap) -> ok. +-spec destroy(This::wxBitmap()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxBitmap), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxBitmapButton.erl b/lib/wx/src/gen/wxBitmapButton.erl index 47ba575fb4..79e51da801 100644 --- a/lib/wx/src/gen/wxBitmapButton.erl +++ b/lib/wx/src/gen/wxBitmapButton.erl @@ -213,7 +213,7 @@ setBitmapSelected(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SelT,ref=SelRef}) <<ThisRef:32/?UI,SelRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxBitmapButton) -> ok. +-spec destroy(This::wxBitmapButton()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxBitmapButton), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxBitmapDataObject.erl b/lib/wx/src/gen/wxBitmapDataObject.erl index 7f6bc973ef..35ab146457 100644 --- a/lib/wx/src/gen/wxBitmapDataObject.erl +++ b/lib/wx/src/gen/wxBitmapDataObject.erl @@ -79,7 +79,7 @@ setBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) - <<ThisRef:32/?UI,BitmapRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxBitmapDataObject) -> ok. +-spec destroy(This::wxBitmapDataObject()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxBitmapDataObject), wxe_util:destroy(?wxBitmapDataObject_destroy,Obj), diff --git a/lib/wx/src/gen/wxBoxSizer.erl b/lib/wx/src/gen/wxBoxSizer.erl index d6d8aadf30..fcf6b5fd65 100644 --- a/lib/wx/src/gen/wxBoxSizer.erl +++ b/lib/wx/src/gen/wxBoxSizer.erl @@ -63,7 +63,7 @@ getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxBoxSizer) -> ok. +-spec destroy(This::wxBoxSizer()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxBoxSizer), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxBrush.erl b/lib/wx/src/gen/wxBrush.erl index 5f67d35310..3436fe0dde 100644 --- a/lib/wx/src/gen/wxBrush.erl +++ b/lib/wx/src/gen/wxBrush.erl @@ -68,7 +68,7 @@ new(Colour, Options) <<(wxe_util:colour_bin(Colour)):16/binary, BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushgetcolour">external documentation</a>. --spec getColour(This) -> wx:wx_colour() when +-spec getColour(This) -> wx:wx_colour4() when This::wxBrush(). getColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxBrush), @@ -144,7 +144,7 @@ setStyle(#wx_ref{type=ThisT,ref=ThisRef},Style) <<ThisRef:32/?UI,Style:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxBrush) -> ok. +-spec destroy(This::wxBrush()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxBrush), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxBufferedDC.erl b/lib/wx/src/gen/wxBufferedDC.erl index c98f8175a0..84dde6c67b 100644 --- a/lib/wx/src/gen/wxBufferedDC.erl +++ b/lib/wx/src/gen/wxBufferedDC.erl @@ -153,7 +153,7 @@ init(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef},{AreaW,AreaH}, <<ThisRef:32/?UI,DcRef:32/?UI,AreaW:32/?UI,AreaH:32/?UI, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxBufferedDC) -> ok. +-spec destroy(This::wxBufferedDC()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxBufferedDC), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxBufferedPaintDC.erl b/lib/wx/src/gen/wxBufferedPaintDC.erl index fbf1b16cad..833d51c435 100644 --- a/lib/wx/src/gen/wxBufferedPaintDC.erl +++ b/lib/wx/src/gen/wxBufferedPaintDC.erl @@ -105,7 +105,7 @@ new(#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{type=BufferT,ref=BufferRef}, Opt <<WindowRef:32/?UI,BufferRef:32/?UI, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxBufferedPaintDC) -> ok. +-spec destroy(This::wxBufferedPaintDC()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxBufferedPaintDC), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxButton.erl b/lib/wx/src/gen/wxButton.erl index facd885175..ae78f53e6f 100644 --- a/lib/wx/src/gen/wxButton.erl +++ b/lib/wx/src/gen/wxButton.erl @@ -95,7 +95,7 @@ new(Parent,Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttonwxbutton">external documentation</a>. -spec new(Parent, Id, [Option]) -> wxButton() when Parent::wxWindow:wxWindow(), Id::integer(), - Option :: {label, string()} + Option :: {label, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -124,7 +124,7 @@ create(This,Parent,Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttoncreate">external documentation</a>. -spec create(This, Parent, Id, [Option]) -> boolean() when This::wxButton(), Parent::wxWindow:wxWindow(), Id::integer(), - Option :: {label, string()} + Option :: {label, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -159,7 +159,7 @@ setDefault(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttonsetlabel">external documentation</a>. -spec setLabel(This, Label) -> ok when - This::wxButton(), Label::string(). + This::wxButton(), Label::unicode:chardata(). setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label) when is_list(Label) -> ?CLASS(ThisT,wxButton), @@ -168,7 +168,7 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label) <<ThisRef:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxButton) -> ok. +-spec destroy(This::wxButton()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxButton), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxCalendarCtrl.erl b/lib/wx/src/gen/wxCalendarCtrl.erl index 7762e7f318..06dd4a0c91 100644 --- a/lib/wx/src/gen/wxCalendarCtrl.erl +++ b/lib/wx/src/gen/wxCalendarCtrl.erl @@ -233,7 +233,7 @@ setHeaderColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg) <<ThisRef:32/?UI,(wxe_util:colour_bin(ColFg)):16/binary,(wxe_util:colour_bin(ColBg)):16/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetheadercolourfg">external documentation</a>. --spec getHeaderColourFg(This) -> wx:wx_colour() when +-spec getHeaderColourFg(This) -> wx:wx_colour4() when This::wxCalendarCtrl(). getHeaderColourFg(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxCalendarCtrl), @@ -241,7 +241,7 @@ getHeaderColourFg(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetheadercolourbg">external documentation</a>. --spec getHeaderColourBg(This) -> wx:wx_colour() when +-spec getHeaderColourBg(This) -> wx:wx_colour4() when This::wxCalendarCtrl(). getHeaderColourBg(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxCalendarCtrl), @@ -258,7 +258,7 @@ setHighlightColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg) <<ThisRef:32/?UI,(wxe_util:colour_bin(ColFg)):16/binary,(wxe_util:colour_bin(ColBg)):16/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgethighlightcolourfg">external documentation</a>. --spec getHighlightColourFg(This) -> wx:wx_colour() when +-spec getHighlightColourFg(This) -> wx:wx_colour4() when This::wxCalendarCtrl(). getHighlightColourFg(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxCalendarCtrl), @@ -266,7 +266,7 @@ getHighlightColourFg(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgethighlightcolourbg">external documentation</a>. --spec getHighlightColourBg(This) -> wx:wx_colour() when +-spec getHighlightColourBg(This) -> wx:wx_colour4() when This::wxCalendarCtrl(). getHighlightColourBg(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxCalendarCtrl), @@ -283,7 +283,7 @@ setHolidayColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg) <<ThisRef:32/?UI,(wxe_util:colour_bin(ColFg)):16/binary,(wxe_util:colour_bin(ColBg)):16/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetholidaycolourfg">external documentation</a>. --spec getHolidayColourFg(This) -> wx:wx_colour() when +-spec getHolidayColourFg(This) -> wx:wx_colour4() when This::wxCalendarCtrl(). getHolidayColourFg(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxCalendarCtrl), @@ -291,7 +291,7 @@ getHolidayColourFg(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetholidaycolourbg">external documentation</a>. --spec getHolidayColourBg(This) -> wx:wx_colour() when +-spec getHolidayColourBg(This) -> wx:wx_colour4() when This::wxCalendarCtrl(). getHolidayColourBg(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxCalendarCtrl), @@ -348,7 +348,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY}) <<ThisRef:32/?UI,PosX:32/?UI,PosY:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxCalendarCtrl) -> ok. +-spec destroy(This::wxCalendarCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxCalendarCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxCalendarDateAttr.erl b/lib/wx/src/gen/wxCalendarDateAttr.erl index c674aee8d6..cfedb401ce 100644 --- a/lib/wx/src/gen/wxCalendarDateAttr.erl +++ b/lib/wx/src/gen/wxCalendarDateAttr.erl @@ -189,7 +189,7 @@ isHoliday(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgettextcolour">external documentation</a>. --spec getTextColour(This) -> wx:wx_colour() when +-spec getTextColour(This) -> wx:wx_colour4() when This::wxCalendarDateAttr(). getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxCalendarDateAttr), @@ -197,7 +197,7 @@ getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgetbackgroundcolour">external documentation</a>. --spec getBackgroundColour(This) -> wx:wx_colour() when +-spec getBackgroundColour(This) -> wx:wx_colour4() when This::wxCalendarDateAttr(). getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxCalendarDateAttr), @@ -205,7 +205,7 @@ getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgetbordercolour">external documentation</a>. --spec getBorderColour(This) -> wx:wx_colour() when +-spec getBorderColour(This) -> wx:wx_colour4() when This::wxCalendarDateAttr(). getBorderColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxCalendarDateAttr), @@ -230,7 +230,7 @@ getBorder(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxCalendarDateAttr) -> ok. +-spec destroy(This::wxCalendarDateAttr()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxCalendarDateAttr), wxe_util:destroy(?wxCalendarDateAttr_destroy,Obj), diff --git a/lib/wx/src/gen/wxCaret.erl b/lib/wx/src/gen/wxCaret.erl index a1f8c29a7f..57db5906f3 100644 --- a/lib/wx/src/gen/wxCaret.erl +++ b/lib/wx/src/gen/wxCaret.erl @@ -194,7 +194,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options) <<ThisRef:32/?UI, 0:32,BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxCaret) -> ok. +-spec destroy(This::wxCaret()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxCaret), wxe_util:destroy(?wxCaret_destruct,Obj), diff --git a/lib/wx/src/gen/wxCheckBox.erl b/lib/wx/src/gen/wxCheckBox.erl index c629af6488..37bca77cae 100644 --- a/lib/wx/src/gen/wxCheckBox.erl +++ b/lib/wx/src/gen/wxCheckBox.erl @@ -87,7 +87,7 @@ new() -> %% @equiv new(Parent,Id,Label, []) -spec new(Parent, Id, Label) -> wxCheckBox() when - Parent::wxWindow:wxWindow(), Id::integer(), Label::string(). + Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(). new(Parent,Id,Label) when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) -> @@ -95,7 +95,7 @@ new(Parent,Id,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxwxcheckbox">external documentation</a>. -spec new(Parent, Id, Label, [Option]) -> wxCheckBox() when - Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), + Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -115,7 +115,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options) %% @equiv create(This,Parent,Id,Label, []) -spec create(This, Parent, Id, Label) -> boolean() when - This::wxCheckBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(). + This::wxCheckBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(). create(This,Parent,Id,Label) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) -> @@ -123,7 +123,7 @@ create(This,Parent,Id,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxcreate">external documentation</a>. -spec create(This, Parent, Id, Label, [Option]) -> boolean() when - This::wxCheckBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), + This::wxCheckBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -203,7 +203,7 @@ set3StateValue(#wx_ref{type=ThisT,ref=ThisRef},State) <<ThisRef:32/?UI,State:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxCheckBox) -> ok. +-spec destroy(This::wxCheckBox()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxCheckBox), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxCheckListBox.erl b/lib/wx/src/gen/wxCheckListBox.erl index 457d58eebc..71199fed3b 100644 --- a/lib/wx/src/gen/wxCheckListBox.erl +++ b/lib/wx/src/gen/wxCheckListBox.erl @@ -104,7 +104,7 @@ new(Parent,Id) Parent::wxWindow:wxWindow(), Id::integer(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} - | {choices, [[string()]]} + | {choices, [[unicode:chardata()]]} | {style, integer()} | {validator, wx:wx()}. new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) @@ -151,7 +151,7 @@ isChecked(#wx_ref{type=ThisT,ref=ThisRef},Index) <<ThisRef:32/?UI,Index:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxCheckListBox) -> ok. +-spec destroy(This::wxCheckListBox()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxCheckListBox), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxChoice.erl b/lib/wx/src/gen/wxChoice.erl index 983e74e65a..b9cac3926c 100644 --- a/lib/wx/src/gen/wxChoice.erl +++ b/lib/wx/src/gen/wxChoice.erl @@ -102,7 +102,7 @@ new(Parent,Id) Parent::wxWindow:wxWindow(), Id::integer(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} - | {choices, [[string()]]} + | {choices, [[unicode:chardata()]]} | {style, integer()} | {validator, wx:wx()}. new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) @@ -120,7 +120,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) %% @equiv create(This,Parent,Id,Pos,Size,Choices, []) -spec create(This, Parent, Id, Pos, Size, Choices) -> boolean() when - This::wxChoice(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]]. + This::wxChoice(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]]. create(This,Parent,Id,Pos={PosX,PosY},Size={SizeW,SizeH},Choices) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) -> @@ -128,7 +128,7 @@ create(This,Parent,Id,Pos={PosX,PosY},Size={SizeW,SizeH},Choices) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicecreate">external documentation</a>. -spec create(This, Parent, Id, Pos, Size, Choices, [Option]) -> boolean() when - This::wxChoice(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]], + This::wxChoice(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]], Option :: {style, integer()} | {validator, wx:wx()}. create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,{PosX,PosY},{SizeW,SizeH},Choices, Options) @@ -183,7 +183,7 @@ setColumns(#wx_ref{type=ThisT,ref=ThisRef}, Options) <<ThisRef:32/?UI, 0:32,BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxChoice) -> ok. +-spec destroy(This::wxChoice()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxChoice), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxChoicebook.erl b/lib/wx/src/gen/wxChoicebook.erl index 556170befa..921e1e2882 100644 --- a/lib/wx/src/gen/wxChoicebook.erl +++ b/lib/wx/src/gen/wxChoicebook.erl @@ -115,7 +115,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) %% @equiv addPage(This,Page,Text, []) -spec addPage(This, Page, Text) -> boolean() when - This::wxChoicebook(), Page::wxWindow:wxWindow(), Text::string(). + This::wxChoicebook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(). addPage(This,Page,Text) when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) -> @@ -123,7 +123,7 @@ addPage(This,Page,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookaddpage">external documentation</a>. -spec addPage(This, Page, Text, [Option]) -> boolean() when - This::wxChoicebook(), Page::wxWindow:wxWindow(), Text::string(), + This::wxChoicebook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options) @@ -263,7 +263,7 @@ getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N) <<ThisRef:32/?UI,N:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetpagetext">external documentation</a>. --spec getPageText(This, N) -> string() when +-spec getPageText(This, N) -> unicode:charlist() when This::wxChoicebook(), N::integer(). getPageText(#wx_ref{type=ThisT,ref=ThisRef},N) when is_integer(N) -> @@ -291,7 +291,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY}) %% @equiv insertPage(This,N,Page,Text, []) -spec insertPage(This, N, Page, Text) -> boolean() when - This::wxChoicebook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(). + This::wxChoicebook(), N::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(). insertPage(This,N,Page,Text) when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),is_list(Text) -> @@ -299,7 +299,7 @@ insertPage(This,N,Page,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookinsertpage">external documentation</a>. -spec insertPage(This, N, Page, Text, [Option]) -> boolean() when - This::wxChoicebook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(), + This::wxChoicebook(), N::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Text, Options) @@ -343,7 +343,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetpagetext">external documentation</a>. -spec setPageText(This, N, StrText) -> boolean() when - This::wxChoicebook(), N::integer(), StrText::string(). + This::wxChoicebook(), N::integer(), StrText::unicode:chardata(). setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText) when is_integer(N),is_list(StrText) -> ?CLASS(ThisT,wxChoicebook), @@ -370,7 +370,7 @@ changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N) <<ThisRef:32/?UI,N:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxChoicebook) -> ok. +-spec destroy(This::wxChoicebook()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxChoicebook), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxClientDC.erl b/lib/wx/src/gen/wxClientDC.erl index eb833d26e1..7dfebe4068 100644 --- a/lib/wx/src/gen/wxClientDC.erl +++ b/lib/wx/src/gen/wxClientDC.erl @@ -75,7 +75,7 @@ new(#wx_ref{type=WinT,ref=WinRef}) -> <<WinRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxClientDC) -> ok. +-spec destroy(This::wxClientDC()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxClientDC), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxClipboard.erl b/lib/wx/src/gen/wxClipboard.erl index 73f57c681e..8f1d59f603 100644 --- a/lib/wx/src/gen/wxClipboard.erl +++ b/lib/wx/src/gen/wxClipboard.erl @@ -145,7 +145,7 @@ get() -> <<>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxClipboard) -> ok. +-spec destroy(This::wxClipboard()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxClipboard), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxColourData.erl b/lib/wx/src/gen/wxColourData.erl index 01b73a59f0..289d423cb6 100644 --- a/lib/wx/src/gen/wxColourData.erl +++ b/lib/wx/src/gen/wxColourData.erl @@ -58,7 +58,7 @@ getChooseFull(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatagetcolour">external documentation</a>. --spec getColour(This) -> wx:wx_colour() when +-spec getColour(This) -> wx:wx_colour4() when This::wxColourData(). getColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxColourData), @@ -66,7 +66,7 @@ getColour(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatagetcustomcolour">external documentation</a>. --spec getCustomColour(This, I) -> wx:wx_colour() when +-spec getCustomColour(This, I) -> wx:wx_colour4() when This::wxColourData(), I::integer(). getCustomColour(#wx_ref{type=ThisT,ref=ThisRef},I) when is_integer(I) -> @@ -102,7 +102,7 @@ setCustomColour(#wx_ref{type=ThisT,ref=ThisRef},I,Colour) <<ThisRef:32/?UI,I:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxColourData) -> ok. +-spec destroy(This::wxColourData()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxColourData), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxColourDialog.erl b/lib/wx/src/gen/wxColourDialog.erl index 7e9ec1975f..8040112426 100644 --- a/lib/wx/src/gen/wxColourDialog.erl +++ b/lib/wx/src/gen/wxColourDialog.erl @@ -144,7 +144,7 @@ getColourData(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxColourDialog) -> ok. +-spec destroy(This::wxColourDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxColourDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxColourPickerCtrl.erl b/lib/wx/src/gen/wxColourPickerCtrl.erl index 91889006f9..d9e0d20df8 100644 --- a/lib/wx/src/gen/wxColourPickerCtrl.erl +++ b/lib/wx/src/gen/wxColourPickerCtrl.erl @@ -149,7 +149,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlgetcolour">external documentation</a>. --spec getColour(This) -> wx:wx_colour() when +-spec getColour(This) -> wx:wx_colour4() when This::wxColourPickerCtrl(). getColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxColourPickerCtrl), @@ -158,7 +158,7 @@ getColour(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlsetcolour">external documentation</a>. -spec setColour(This, Text) -> boolean() when - This::wxColourPickerCtrl(), Text::string(); + This::wxColourPickerCtrl(), Text::unicode:chardata(); (This, Col) -> ok when This::wxColourPickerCtrl(), Col::wx:wx_colour(). setColour(#wx_ref{type=ThisT,ref=ThisRef},Text) @@ -174,7 +174,7 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},Col) <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxColourPickerCtrl) -> ok. +-spec destroy(This::wxColourPickerCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxColourPickerCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxColourPickerEvent.erl b/lib/wx/src/gen/wxColourPickerEvent.erl index fbd34cf9e7..71a3fd3e5b 100644 --- a/lib/wx/src/gen/wxColourPickerEvent.erl +++ b/lib/wx/src/gen/wxColourPickerEvent.erl @@ -48,7 +48,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxColourPickerEvent() :: wx:wx_object(). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerevent.html#wxcolourpickereventgetcolour">external documentation</a>. --spec getColour(This) -> wx:wx_colour() when +-spec getColour(This) -> wx:wx_colour4() when This::wxColourPickerEvent(). getColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxColourPickerEvent), diff --git a/lib/wx/src/gen/wxComboBox.erl b/lib/wx/src/gen/wxComboBox.erl index 88cee2e3a4..b9224d18b9 100644 --- a/lib/wx/src/gen/wxComboBox.erl +++ b/lib/wx/src/gen/wxComboBox.erl @@ -102,10 +102,10 @@ new(Parent,Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxwxcombobox">external documentation</a>. -spec new(Parent, Id, [Option]) -> wxComboBox() when Parent::wxWindow:wxWindow(), Id::integer(), - Option :: {value, string()} + Option :: {value, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} - | {choices, [[string()]]} + | {choices, [[unicode:chardata()]]} | {style, integer()} | {validator, wx:wx()}. new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) @@ -124,7 +124,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) %% @equiv create(This,Parent,Id,Value,Pos,Size,Choices, []) -spec create(This, Parent, Id, Value, Pos, Size, Choices) -> boolean() when - This::wxComboBox(), Parent::wxWindow:wxWindow(), Id::integer(), Value::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]]. + This::wxComboBox(), Parent::wxWindow:wxWindow(), Id::integer(), Value::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]]. create(This,Parent,Id,Value,Pos={PosX,PosY},Size={SizeW,SizeH},Choices) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Value),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) -> @@ -132,7 +132,7 @@ create(This,Parent,Id,Value,Pos={PosX,PosY},Size={SizeW,SizeH},Choices) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcreate">external documentation</a>. -spec create(This, Parent, Id, Value, Pos, Size, Choices, [Option]) -> boolean() when - This::wxComboBox(), Parent::wxWindow:wxWindow(), Id::integer(), Value::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]], + This::wxComboBox(), Parent::wxWindow:wxWindow(), Id::integer(), Value::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]], Option :: {style, integer()} | {validator, wx:wx()}. create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Value,{PosX,PosY},{SizeW,SizeH},Choices, Options) @@ -222,7 +222,7 @@ getLastPosition(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxgetvalue">external documentation</a>. --spec getValue(This) -> string() when +-spec getValue(This) -> unicode:charlist() when This::wxComboBox(). getValue(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxComboBox), @@ -247,7 +247,7 @@ redo(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxreplace">external documentation</a>. -spec replace(This, From, To, Value) -> ok when - This::wxComboBox(), From::integer(), To::integer(), Value::string(). + This::wxComboBox(), From::integer(), To::integer(), Value::unicode:chardata(). replace(#wx_ref{type=ThisT,ref=ThisRef},From,To,Value) when is_integer(From),is_integer(To),is_list(Value) -> ?CLASS(ThisT,wxComboBox), @@ -301,7 +301,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},From,To) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetvalue">external documentation</a>. -spec setValue(This, Value) -> ok when - This::wxComboBox(), Value::string(). + This::wxComboBox(), Value::unicode:chardata(). setValue(#wx_ref{type=ThisT,ref=ThisRef},Value) when is_list(Value) -> ?CLASS(ThisT,wxComboBox), @@ -318,7 +318,7 @@ undo(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxComboBox) -> ok. +-spec destroy(This::wxComboBox()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxComboBox), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxCommandEvent.erl b/lib/wx/src/gen/wxCommandEvent.erl index 16414da4dd..a7567163cf 100644 --- a/lib/wx/src/gen/wxCommandEvent.erl +++ b/lib/wx/src/gen/wxCommandEvent.erl @@ -77,7 +77,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetstring">external documentation</a>. --spec getString(This) -> string() when +-spec getString(This) -> unicode:charlist() when This::wxCommandEvent(). getString(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxCommandEvent), @@ -111,7 +111,7 @@ setInt(#wx_ref{type=ThisT,ref=ThisRef},I) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventsetstring">external documentation</a>. -spec setString(This, S) -> ok when - This::wxCommandEvent(), S::string(). + This::wxCommandEvent(), S::unicode:chardata(). setString(#wx_ref{type=ThisT,ref=ThisRef},S) when is_list(S) -> ?CLASS(ThisT,wxCommandEvent), diff --git a/lib/wx/src/gen/wxControl.erl b/lib/wx/src/gen/wxControl.erl index 743ec5151f..f840d0c6bc 100644 --- a/lib/wx/src/gen/wxControl.erl +++ b/lib/wx/src/gen/wxControl.erl @@ -76,7 +76,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxControl() :: wx:wx_object(). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrol.html#wxcontrolgetlabel">external documentation</a>. --spec getLabel(This) -> string() when +-spec getLabel(This) -> unicode:charlist() when This::wxControl(). getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxControl), @@ -85,7 +85,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrol.html#wxcontrolsetlabel">external documentation</a>. -spec setLabel(This, Label) -> ok when - This::wxControl(), Label::string(). + This::wxControl(), Label::unicode:chardata(). setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label) when is_list(Label) -> ?CLASS(ThisT,wxControl), diff --git a/lib/wx/src/gen/wxControlWithItems.erl b/lib/wx/src/gen/wxControlWithItems.erl index b57f472b04..1e2f89dbf0 100644 --- a/lib/wx/src/gen/wxControlWithItems.erl +++ b/lib/wx/src/gen/wxControlWithItems.erl @@ -82,7 +82,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxControlWithItems() :: wx:wx_object(). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>. -spec append(This, Item) -> integer() when - This::wxControlWithItems(), Item::string(). + This::wxControlWithItems(), Item::unicode:chardata(). append(#wx_ref{type=ThisT,ref=ThisRef},Item) when is_list(Item) -> ?CLASS(ThisT,wxControlWithItems), @@ -92,7 +92,7 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Item) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>. -spec append(This, Item, ClientData) -> integer() when - This::wxControlWithItems(), Item::string(), ClientData::term(). + This::wxControlWithItems(), Item::unicode:chardata(), ClientData::term(). append(#wx_ref{type=ThisT,ref=ThisRef},Item,ClientData) when is_list(Item) -> ?CLASS(ThisT,wxControlWithItems), @@ -103,7 +103,7 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Item,ClientData) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>. -spec appendStrings(This, Strings) -> ok when - This::wxControlWithItems(), Strings::[[string()]]. + This::wxControlWithItems(), Strings::[[unicode:chardata()]]. appendStrings(#wx_ref{type=ThisT,ref=ThisRef},Strings) when is_list(Strings) -> ?CLASS(ThisT,wxControlWithItems), @@ -131,7 +131,7 @@ delete(#wx_ref{type=ThisT,ref=ThisRef},N) %% @equiv findString(This,S, []) -spec findString(This, S) -> integer() when - This::wxControlWithItems(), S::string(). + This::wxControlWithItems(), S::unicode:chardata(). findString(This,S) when is_record(This, wx_ref),is_list(S) -> @@ -139,7 +139,7 @@ findString(This,S) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsfindstring">external documentation</a>. -spec findString(This, S, [Option]) -> integer() when - This::wxControlWithItems(), S::string(), + This::wxControlWithItems(), S::unicode:chardata(), Option :: {bCase, boolean()}. findString(#wx_ref{type=ThisT,ref=ThisRef},S, Options) when is_list(S),is_list(Options) -> @@ -187,7 +187,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetstring">external documentation</a>. --spec getString(This, N) -> string() when +-spec getString(This, N) -> unicode:charlist() when This::wxControlWithItems(), N::integer(). getString(#wx_ref{type=ThisT,ref=ThisRef},N) when is_integer(N) -> @@ -196,7 +196,7 @@ getString(#wx_ref{type=ThisT,ref=ThisRef},N) <<ThisRef:32/?UI,N:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetstringselection">external documentation</a>. --spec getStringSelection(This) -> string() when +-spec getStringSelection(This) -> unicode:charlist() when This::wxControlWithItems(). getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxControlWithItems), @@ -205,7 +205,7 @@ getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsinsert">external documentation</a>. -spec insert(This, Item, Pos) -> integer() when - This::wxControlWithItems(), Item::string(), Pos::integer(). + This::wxControlWithItems(), Item::unicode:chardata(), Pos::integer(). insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos) when is_list(Item),is_integer(Pos) -> ?CLASS(ThisT,wxControlWithItems), @@ -215,7 +215,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsinsert">external documentation</a>. -spec insert(This, Item, Pos, ClientData) -> integer() when - This::wxControlWithItems(), Item::string(), Pos::integer(), ClientData::term(). + This::wxControlWithItems(), Item::unicode:chardata(), Pos::integer(), ClientData::term(). insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos,ClientData) when is_list(Item),is_integer(Pos) -> ?CLASS(ThisT,wxControlWithItems), @@ -252,7 +252,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},N) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemssetstring">external documentation</a>. -spec setString(This, N, S) -> ok when - This::wxControlWithItems(), N::integer(), S::string(). + This::wxControlWithItems(), N::integer(), S::unicode:chardata(). setString(#wx_ref{type=ThisT,ref=ThisRef},N,S) when is_integer(N),is_list(S) -> ?CLASS(ThisT,wxControlWithItems), @@ -262,7 +262,7 @@ setString(#wx_ref{type=ThisT,ref=ThisRef},N,S) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemssetstringselection">external documentation</a>. -spec setStringSelection(This, S) -> boolean() when - This::wxControlWithItems(), S::string(). + This::wxControlWithItems(), S::unicode:chardata(). setStringSelection(#wx_ref{type=ThisT,ref=ThisRef},S) when is_list(S) -> ?CLASS(ThisT,wxControlWithItems), diff --git a/lib/wx/src/gen/wxCursor.erl b/lib/wx/src/gen/wxCursor.erl index 3274e16454..78becd48e8 100644 --- a/lib/wx/src/gen/wxCursor.erl +++ b/lib/wx/src/gen/wxCursor.erl @@ -92,7 +92,7 @@ ok(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxCursor) -> ok. +-spec destroy(This::wxCursor()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxCursor), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxDC.erl b/lib/wx/src/gen/wxDC.erl index 4762ee7cd1..9b2c21f4b0 100644 --- a/lib/wx/src/gen/wxDC.erl +++ b/lib/wx/src/gen/wxDC.erl @@ -246,7 +246,7 @@ drawIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef},{PtX,Pt %% @equiv drawLabel(This,Text,Rect, []) -spec drawLabel(This, Text, Rect) -> ok when - This::wxDC(), Text::string(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}. + This::wxDC(), Text::unicode:chardata(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}. drawLabel(This,Text,Rect={RectX,RectY,RectW,RectH}) when is_record(This, wx_ref),is_list(Text),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) -> @@ -254,7 +254,7 @@ drawLabel(This,Text,Rect={RectX,RectY,RectW,RectH}) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawlabel">external documentation</a>. -spec drawLabel(This, Text, Rect, [Option]) -> ok when - This::wxDC(), Text::string(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, + This::wxDC(), Text::unicode:chardata(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, Option :: {alignment, integer()} | {indexAccel, integer()}. drawLabel(#wx_ref{type=ThisT,ref=ThisRef},Text,{RectX,RectY,RectW,RectH}, Options) @@ -356,7 +356,7 @@ drawRectangle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH}) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawrotatedtext">external documentation</a>. -spec drawRotatedText(This, Text, Pt, Angle) -> ok when - This::wxDC(), Text::string(), Pt::{X::integer(), Y::integer()}, Angle::number(). + This::wxDC(), Text::unicode:chardata(), Pt::{X::integer(), Y::integer()}, Angle::number(). drawRotatedText(#wx_ref{type=ThisT,ref=ThisRef},Text,{PtX,PtY},Angle) when is_list(Text),is_integer(PtX),is_integer(PtY),is_number(Angle) -> ?CLASS(ThisT,wxDC), @@ -384,7 +384,7 @@ drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH},Radius) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawtext">external documentation</a>. -spec drawText(This, Text, Pt) -> ok when - This::wxDC(), Text::string(), Pt::{X::integer(), Y::integer()}. + This::wxDC(), Text::unicode:chardata(), Pt::{X::integer(), Y::integer()}. drawText(#wx_ref{type=ThisT,ref=ThisRef},Text,{PtX,PtY}) when is_list(Text),is_integer(PtX),is_integer(PtY) -> ?CLASS(ThisT,wxDC), @@ -513,7 +513,7 @@ getMapMode(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetmultilinetextextent">external documentation</a>. -spec getMultiLineTextExtent(This, String) -> {W::integer(), H::integer()} when - This::wxDC(), String::string(). + This::wxDC(), String::unicode:chardata(). getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String) when is_list(String) -> ?CLASS(ThisT,wxDC), @@ -523,7 +523,7 @@ getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetmultilinetextextent">external documentation</a>. -spec getMultiLineTextExtent(This, String, [Option]) -> {Width::integer(), Height::integer(), HeightLine::integer()} when - This::wxDC(), String::string(), + This::wxDC(), String::unicode:chardata(), Option :: {font, wxFont:wxFont()}. getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options) when is_list(String),is_list(Options) -> @@ -538,7 +538,7 @@ getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetpartialtextextents">external documentation</a>. -spec getPartialTextExtents(This, Text) -> Result when Result ::{Res ::boolean(), Widths::[integer()]}, - This::wxDC(), Text::string(). + This::wxDC(), Text::unicode:chardata(). getPartialTextExtents(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxDC), @@ -556,7 +556,7 @@ getPen(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetpixel">external documentation</a>. -spec getPixel(This, Pt) -> Result when - Result ::{Res ::boolean(), Col::wx:wx_colour()}, + Result ::{Res ::boolean(), Col::wx:wx_colour4()}, This::wxDC(), Pt::{X::integer(), Y::integer()}. getPixel(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY}) when is_integer(PtX),is_integer(PtY) -> @@ -589,7 +589,7 @@ getSizeMM(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextbackground">external documentation</a>. --spec getTextBackground(This) -> wx:wx_colour() when +-spec getTextBackground(This) -> wx:wx_colour4() when This::wxDC(). getTextBackground(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxDC), @@ -598,7 +598,7 @@ getTextBackground(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextextent">external documentation</a>. -spec getTextExtent(This, String) -> {W::integer(), H::integer()} when - This::wxDC(), String::string(). + This::wxDC(), String::unicode:chardata(). getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String) when is_list(String) -> ?CLASS(ThisT,wxDC), @@ -609,7 +609,7 @@ getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextextent">external documentation</a>. -spec getTextExtent(This, String, [Option]) -> Result when Result :: {X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()}, - This::wxDC(), String::string(), + This::wxDC(), String::unicode:chardata(), Option :: {theFont, wxFont:wxFont()}. getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options) when is_list(String),is_list(Options) -> @@ -622,7 +622,7 @@ getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options) <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextforeground">external documentation</a>. --spec getTextForeground(This) -> wx:wx_colour() when +-spec getTextForeground(This) -> wx:wx_colour4() when This::wxDC(). getTextForeground(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxDC), @@ -915,7 +915,7 @@ setUserScale(#wx_ref{type=ThisT,ref=ThisRef},X,Y) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcstartdoc">external documentation</a>. -spec startDoc(This, Message) -> boolean() when - This::wxDC(), Message::string(). + This::wxDC(), Message::unicode:chardata(). startDoc(#wx_ref{type=ThisT,ref=ThisRef},Message) when is_list(Message) -> ?CLASS(ThisT,wxDC), diff --git a/lib/wx/src/gen/wxDatePickerCtrl.erl b/lib/wx/src/gen/wxDatePickerCtrl.erl index e1c16d3612..ad66d1cf03 100644 --- a/lib/wx/src/gen/wxDatePickerCtrl.erl +++ b/lib/wx/src/gen/wxDatePickerCtrl.erl @@ -154,7 +154,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Date) <<ThisRef:32/?UI,(wxe_util:datetime_bin(Date)):24/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxDatePickerCtrl) -> ok. +-spec destroy(This::wxDatePickerCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxDatePickerCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxDialog.erl b/lib/wx/src/gen/wxDialog.erl index 137ad27a45..55861b75d1 100644 --- a/lib/wx/src/gen/wxDialog.erl +++ b/lib/wx/src/gen/wxDialog.erl @@ -92,7 +92,7 @@ new() -> %% @equiv new(Parent,Id,Title, []) -spec new(Parent, Id, Title) -> wxDialog() when - Parent::wxWindow:wxWindow(), Id::integer(), Title::string(). + Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(). new(Parent,Id,Title) when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) -> @@ -100,7 +100,7 @@ new(Parent,Id,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogwxdialog">external documentation</a>. -spec new(Parent, Id, Title, [Option]) -> wxDialog() when - Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), + Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -118,7 +118,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options) %% @equiv create(This,Parent,Id,Title, []) -spec create(This, Parent, Id, Title) -> boolean() when - This::wxDialog(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(). + This::wxDialog(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(). create(This,Parent,Id,Title) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) -> @@ -126,7 +126,7 @@ create(This,Parent,Id,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogcreate">external documentation</a>. -spec create(This, Parent, Id, Title, [Option]) -> boolean() when - This::wxDialog(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), + This::wxDialog(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -242,7 +242,7 @@ showModal(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxDialog) -> ok. +-spec destroy(This::wxDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxDirDialog.erl b/lib/wx/src/gen/wxDirDialog.erl index 6104803294..d7dc735937 100644 --- a/lib/wx/src/gen/wxDirDialog.erl +++ b/lib/wx/src/gen/wxDirDialog.erl @@ -97,8 +97,8 @@ new(Parent) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialogwxdirdialog">external documentation</a>. -spec new(Parent, [Option]) -> wxDirDialog() when Parent::wxWindow:wxWindow(), - Option :: {title, string()} - | {defaultPath, string()} + Option :: {title, unicode:chardata()} + | {defaultPath, unicode:chardata()} | {style, integer()} | {pos, {X::integer(), Y::integer()}} | {sz, {W::integer(), H::integer()}}. @@ -116,7 +116,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options) <<ParentRef:32/?UI, 0:32,BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialoggetpath">external documentation</a>. --spec getPath(This) -> string() when +-spec getPath(This) -> unicode:charlist() when This::wxDirDialog(). getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxDirDialog), @@ -124,7 +124,7 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialoggetmessage">external documentation</a>. --spec getMessage(This) -> string() when +-spec getMessage(This) -> unicode:charlist() when This::wxDirDialog(). getMessage(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxDirDialog), @@ -133,7 +133,7 @@ getMessage(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialogsetmessage">external documentation</a>. -spec setMessage(This, Message) -> ok when - This::wxDirDialog(), Message::string(). + This::wxDirDialog(), Message::unicode:chardata(). setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message) when is_list(Message) -> ?CLASS(ThisT,wxDirDialog), @@ -143,7 +143,7 @@ setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialogsetpath">external documentation</a>. -spec setPath(This, Path) -> ok when - This::wxDirDialog(), Path::string(). + This::wxDirDialog(), Path::unicode:chardata(). setPath(#wx_ref{type=ThisT,ref=ThisRef},Path) when is_list(Path) -> ?CLASS(ThisT,wxDirDialog), @@ -152,7 +152,7 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Path) <<ThisRef:32/?UI,(byte_size(Path_UC)):32/?UI,(Path_UC)/binary, 0:(((8- ((0+byte_size(Path_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxDirDialog) -> ok. +-spec destroy(This::wxDirDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxDirDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxDirPickerCtrl.erl b/lib/wx/src/gen/wxDirPickerCtrl.erl index 667119c987..5bc79ca7a1 100644 --- a/lib/wx/src/gen/wxDirPickerCtrl.erl +++ b/lib/wx/src/gen/wxDirPickerCtrl.erl @@ -100,8 +100,8 @@ new(Parent,Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlwxdirpickerctrl">external documentation</a>. -spec new(Parent, Id, [Option]) -> wxDirPickerCtrl() when Parent::wxWindow:wxWindow(), Id::integer(), - Option :: {path, string()} - | {message, string()} + Option :: {path, unicode:chardata()} + | {message, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -131,8 +131,8 @@ create(This,Parent,Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlcreate">external documentation</a>. -spec create(This, Parent, Id, [Option]) -> boolean() when This::wxDirPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(), - Option :: {path, string()} - | {message, string()} + Option :: {path, unicode:chardata()} + | {message, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -153,7 +153,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlgetpath">external documentation</a>. --spec getPath(This) -> string() when +-spec getPath(This) -> unicode:charlist() when This::wxDirPickerCtrl(). getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxDirPickerCtrl), @@ -162,7 +162,7 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlsetpath">external documentation</a>. -spec setPath(This, Str) -> ok when - This::wxDirPickerCtrl(), Str::string(). + This::wxDirPickerCtrl(), Str::unicode:chardata(). setPath(#wx_ref{type=ThisT,ref=ThisRef},Str) when is_list(Str) -> ?CLASS(ThisT,wxDirPickerCtrl), @@ -171,7 +171,7 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Str) <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxDirPickerCtrl) -> ok. +-spec destroy(This::wxDirPickerCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxDirPickerCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxFileDataObject.erl b/lib/wx/src/gen/wxFileDataObject.erl index 3349005821..bcb30a5ece 100644 --- a/lib/wx/src/gen/wxFileDataObject.erl +++ b/lib/wx/src/gen/wxFileDataObject.erl @@ -46,7 +46,7 @@ new() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledataobject.html#wxfiledataobjectaddfile">external documentation</a>. -spec addFile(This, Filename) -> ok when - This::wxFileDataObject(), Filename::string(). + This::wxFileDataObject(), Filename::unicode:chardata(). addFile(#wx_ref{type=ThisT,ref=ThisRef},Filename) when is_list(Filename) -> ?CLASS(ThisT,wxFileDataObject), @@ -55,7 +55,7 @@ addFile(#wx_ref{type=ThisT,ref=ThisRef},Filename) <<ThisRef:32/?UI,(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((0+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledataobject.html#wxfiledataobjectgetfilenames">external documentation</a>. --spec getFilenames(This) -> [[string()]] when +-spec getFilenames(This) -> [[unicode:charlist()]] when This::wxFileDataObject(). getFilenames(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFileDataObject), @@ -63,7 +63,7 @@ getFilenames(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFileDataObject) -> ok. +-spec destroy(This::wxFileDataObject()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFileDataObject), wxe_util:destroy(?wxFileDataObject_destroy,Obj), diff --git a/lib/wx/src/gen/wxFileDialog.erl b/lib/wx/src/gen/wxFileDialog.erl index b6bd7f164a..3d65c92758 100644 --- a/lib/wx/src/gen/wxFileDialog.erl +++ b/lib/wx/src/gen/wxFileDialog.erl @@ -99,10 +99,10 @@ new(Parent) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogwxfiledialog">external documentation</a>. -spec new(Parent, [Option]) -> wxFileDialog() when Parent::wxWindow:wxWindow(), - Option :: {message, string()} - | {defaultDir, string()} - | {defaultFile, string()} - | {wildCard, string()} + Option :: {message, unicode:chardata()} + | {defaultDir, unicode:chardata()} + | {defaultFile, unicode:chardata()} + | {wildCard, unicode:chardata()} | {style, integer()} | {pos, {X::integer(), Y::integer()}} | {sz, {W::integer(), H::integer()}}. @@ -122,7 +122,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options) <<ParentRef:32/?UI, 0:32,BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetdirectory">external documentation</a>. --spec getDirectory(This) -> string() when +-spec getDirectory(This) -> unicode:charlist() when This::wxFileDialog(). getDirectory(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFileDialog), @@ -130,7 +130,7 @@ getDirectory(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetfilename">external documentation</a>. --spec getFilename(This) -> string() when +-spec getFilename(This) -> unicode:charlist() when This::wxFileDialog(). getFilename(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFileDialog), @@ -138,7 +138,7 @@ getFilename(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetfilenames">external documentation</a>. --spec getFilenames(This) -> [[string()]] when +-spec getFilenames(This) -> [[unicode:charlist()]] when This::wxFileDialog(). getFilenames(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFileDialog), @@ -154,7 +154,7 @@ getFilterIndex(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetmessage">external documentation</a>. --spec getMessage(This) -> string() when +-spec getMessage(This) -> unicode:charlist() when This::wxFileDialog(). getMessage(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFileDialog), @@ -162,7 +162,7 @@ getMessage(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetpath">external documentation</a>. --spec getPath(This) -> string() when +-spec getPath(This) -> unicode:charlist() when This::wxFileDialog(). getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFileDialog), @@ -170,7 +170,7 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetpaths">external documentation</a>. --spec getPaths(This) -> [[string()]] when +-spec getPaths(This) -> [[unicode:charlist()]] when This::wxFileDialog(). getPaths(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFileDialog), @@ -178,7 +178,7 @@ getPaths(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetwildcard">external documentation</a>. --spec getWildcard(This) -> string() when +-spec getWildcard(This) -> unicode:charlist() when This::wxFileDialog(). getWildcard(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFileDialog), @@ -187,7 +187,7 @@ getWildcard(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetdirectory">external documentation</a>. -spec setDirectory(This, Dir) -> ok when - This::wxFileDialog(), Dir::string(). + This::wxFileDialog(), Dir::unicode:chardata(). setDirectory(#wx_ref{type=ThisT,ref=ThisRef},Dir) when is_list(Dir) -> ?CLASS(ThisT,wxFileDialog), @@ -197,7 +197,7 @@ setDirectory(#wx_ref{type=ThisT,ref=ThisRef},Dir) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetfilename">external documentation</a>. -spec setFilename(This, Name) -> ok when - This::wxFileDialog(), Name::string(). + This::wxFileDialog(), Name::unicode:chardata(). setFilename(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxFileDialog), @@ -216,7 +216,7 @@ setFilterIndex(#wx_ref{type=ThisT,ref=ThisRef},FilterIndex) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetmessage">external documentation</a>. -spec setMessage(This, Message) -> ok when - This::wxFileDialog(), Message::string(). + This::wxFileDialog(), Message::unicode:chardata(). setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message) when is_list(Message) -> ?CLASS(ThisT,wxFileDialog), @@ -226,7 +226,7 @@ setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetpath">external documentation</a>. -spec setPath(This, Path) -> ok when - This::wxFileDialog(), Path::string(). + This::wxFileDialog(), Path::unicode:chardata(). setPath(#wx_ref{type=ThisT,ref=ThisRef},Path) when is_list(Path) -> ?CLASS(ThisT,wxFileDialog), @@ -236,7 +236,7 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Path) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetwildcard">external documentation</a>. -spec setWildcard(This, WildCard) -> ok when - This::wxFileDialog(), WildCard::string(). + This::wxFileDialog(), WildCard::unicode:chardata(). setWildcard(#wx_ref{type=ThisT,ref=ThisRef},WildCard) when is_list(WildCard) -> ?CLASS(ThisT,wxFileDialog), @@ -245,7 +245,7 @@ setWildcard(#wx_ref{type=ThisT,ref=ThisRef},WildCard) <<ThisRef:32/?UI,(byte_size(WildCard_UC)):32/?UI,(WildCard_UC)/binary, 0:(((8- ((0+byte_size(WildCard_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFileDialog) -> ok. +-spec destroy(This::wxFileDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFileDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxFileDirPickerEvent.erl b/lib/wx/src/gen/wxFileDirPickerEvent.erl index 1ed803ea74..77b10a91ed 100644 --- a/lib/wx/src/gen/wxFileDirPickerEvent.erl +++ b/lib/wx/src/gen/wxFileDirPickerEvent.erl @@ -48,7 +48,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxFileDirPickerEvent() :: wx:wx_object(). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledirpickerevent.html#wxfiledirpickereventgetpath">external documentation</a>. --spec getPath(This) -> string() when +-spec getPath(This) -> unicode:charlist() when This::wxFileDirPickerEvent(). getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFileDirPickerEvent), diff --git a/lib/wx/src/gen/wxFilePickerCtrl.erl b/lib/wx/src/gen/wxFilePickerCtrl.erl index 456483ec55..f13c20f6c7 100644 --- a/lib/wx/src/gen/wxFilePickerCtrl.erl +++ b/lib/wx/src/gen/wxFilePickerCtrl.erl @@ -100,9 +100,9 @@ new(Parent,Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlwxfilepickerctrl">external documentation</a>. -spec new(Parent, Id, [Option]) -> wxFilePickerCtrl() when Parent::wxWindow:wxWindow(), Id::integer(), - Option :: {path, string()} - | {message, string()} - | {wildcard, string()} + Option :: {path, unicode:chardata()} + | {message, unicode:chardata()} + | {wildcard, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -133,9 +133,9 @@ create(This,Parent,Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlcreate">external documentation</a>. -spec create(This, Parent, Id, [Option]) -> boolean() when This::wxFilePickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(), - Option :: {path, string()} - | {message, string()} - | {wildcard, string()} + Option :: {path, unicode:chardata()} + | {message, unicode:chardata()} + | {wildcard, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -157,7 +157,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlgetpath">external documentation</a>. --spec getPath(This) -> string() when +-spec getPath(This) -> unicode:charlist() when This::wxFilePickerCtrl(). getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFilePickerCtrl), @@ -166,7 +166,7 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlsetpath">external documentation</a>. -spec setPath(This, Str) -> ok when - This::wxFilePickerCtrl(), Str::string(). + This::wxFilePickerCtrl(), Str::unicode:chardata(). setPath(#wx_ref{type=ThisT,ref=ThisRef},Str) when is_list(Str) -> ?CLASS(ThisT,wxFilePickerCtrl), @@ -175,7 +175,7 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Str) <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFilePickerCtrl) -> ok. +-spec destroy(This::wxFilePickerCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFilePickerCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxFindReplaceData.erl b/lib/wx/src/gen/wxFindReplaceData.erl index fbc207b758..8dc6036da6 100644 --- a/lib/wx/src/gen/wxFindReplaceData.erl +++ b/lib/wx/src/gen/wxFindReplaceData.erl @@ -50,7 +50,7 @@ new(Flags) <<Flags:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatagetfindstring">external documentation</a>. --spec getFindString(This) -> string() when +-spec getFindString(This) -> unicode:charlist() when This::wxFindReplaceData(). getFindString(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFindReplaceData), @@ -58,7 +58,7 @@ getFindString(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatagetreplacestring">external documentation</a>. --spec getReplaceString(This) -> string() when +-spec getReplaceString(This) -> unicode:charlist() when This::wxFindReplaceData(). getReplaceString(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFindReplaceData), @@ -84,7 +84,7 @@ setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatasetfindstring">external documentation</a>. -spec setFindString(This, Str) -> ok when - This::wxFindReplaceData(), Str::string(). + This::wxFindReplaceData(), Str::unicode:chardata(). setFindString(#wx_ref{type=ThisT,ref=ThisRef},Str) when is_list(Str) -> ?CLASS(ThisT,wxFindReplaceData), @@ -94,7 +94,7 @@ setFindString(#wx_ref{type=ThisT,ref=ThisRef},Str) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatasetreplacestring">external documentation</a>. -spec setReplaceString(This, Str) -> ok when - This::wxFindReplaceData(), Str::string(). + This::wxFindReplaceData(), Str::unicode:chardata(). setReplaceString(#wx_ref{type=ThisT,ref=ThisRef},Str) when is_list(Str) -> ?CLASS(ThisT,wxFindReplaceData), @@ -103,7 +103,7 @@ setReplaceString(#wx_ref{type=ThisT,ref=ThisRef},Str) <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFindReplaceData) -> ok. +-spec destroy(This::wxFindReplaceData()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFindReplaceData), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxFindReplaceDialog.erl b/lib/wx/src/gen/wxFindReplaceDialog.erl index cef41e6d20..6db9b3ed53 100644 --- a/lib/wx/src/gen/wxFindReplaceDialog.erl +++ b/lib/wx/src/gen/wxFindReplaceDialog.erl @@ -94,7 +94,7 @@ new() -> %% @equiv new(Parent,Data,Title, []) -spec new(Parent, Data, Title) -> wxFindReplaceDialog() when - Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string(). + Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::unicode:chardata(). new(Parent,Data,Title) when is_record(Parent, wx_ref),is_record(Data, wx_ref),is_list(Title) -> @@ -102,7 +102,7 @@ new(Parent,Data,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html#wxfindreplacedialogwxfindreplacedialog">external documentation</a>. -spec new(Parent, Data, Title, [Option]) -> wxFindReplaceDialog() when - Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string(), + Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::unicode:chardata(), Option :: {style, integer()}. new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef},Title, Options) when is_list(Title),is_list(Options) -> @@ -117,7 +117,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef},Title, O %% @equiv create(This,Parent,Data,Title, []) -spec create(This, Parent, Data, Title) -> boolean() when - This::wxFindReplaceDialog(), Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string(). + This::wxFindReplaceDialog(), Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::unicode:chardata(). create(This,Parent,Data,Title) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_record(Data, wx_ref),is_list(Title) -> @@ -125,7 +125,7 @@ create(This,Parent,Data,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html#wxfindreplacedialogcreate">external documentation</a>. -spec create(This, Parent, Data, Title, [Option]) -> boolean() when - This::wxFindReplaceDialog(), Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::string(), + This::wxFindReplaceDialog(), Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::unicode:chardata(), Option :: {style, integer()}. create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef},Title, Options) when is_list(Title),is_list(Options) -> @@ -148,7 +148,7 @@ getData(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFindReplaceDialog) -> ok. +-spec destroy(This::wxFindReplaceDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFindReplaceDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxFlexGridSizer.erl b/lib/wx/src/gen/wxFlexGridSizer.erl index d22ae74015..91dcf6a2e7 100644 --- a/lib/wx/src/gen/wxFlexGridSizer.erl +++ b/lib/wx/src/gen/wxFlexGridSizer.erl @@ -179,7 +179,7 @@ setNonFlexibleGrowMode(#wx_ref{type=ThisT,ref=ThisRef},Mode) <<ThisRef:32/?UI,Mode:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFlexGridSizer) -> ok. +-spec destroy(This::wxFlexGridSizer()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFlexGridSizer), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxFont.erl b/lib/wx/src/gen/wxFont.erl index dc8c738b49..f05ac62d8b 100644 --- a/lib/wx/src/gen/wxFont.erl +++ b/lib/wx/src/gen/wxFont.erl @@ -46,7 +46,7 @@ new() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontwxfont">external documentation</a>. -spec new(Fontname) -> wxFont() when - Fontname::string(). + Fontname::unicode:chardata(). new(Fontname) when is_list(Fontname) -> Fontname_UC = unicode:characters_to_binary([Fontname,0]), @@ -68,7 +68,7 @@ new(Size,Family,Style,Weight) -spec new(Size, Family, Style, Weight, [Option]) -> wxFont() when Size::integer(), Family::wx:wx_enum(), Style::wx:wx_enum(), Weight::integer(), Option :: {underlined, boolean()} - | {face, string()} + | {face, unicode:chardata()} | {encoding, wx:wx_enum()}. new(Size,Family,Style,Weight, Options) when is_integer(Size),is_integer(Family),is_integer(Style),is_integer(Weight),is_list(Options) -> @@ -96,7 +96,7 @@ getDefaultEncoding() -> <<>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetfacename">external documentation</a>. --spec getFaceName(This) -> string() when +-spec getFaceName(This) -> unicode:charlist() when This::wxFont(). getFaceName(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFont), @@ -113,7 +113,7 @@ getFamily(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetnativefontinfodesc">external documentation</a>. --spec getNativeFontInfoDesc(This) -> string() when +-spec getNativeFontInfoDesc(This) -> unicode:charlist() when This::wxFont(). getNativeFontInfoDesc(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFont), @@ -121,7 +121,7 @@ getNativeFontInfoDesc(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetnativefontinfouserdesc">external documentation</a>. --spec getNativeFontInfoUserDesc(This) -> string() when +-spec getNativeFontInfoUserDesc(This) -> unicode:charlist() when This::wxFont(). getNativeFontInfoUserDesc(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFont), @@ -180,7 +180,7 @@ setDefaultEncoding(Encoding) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetfacename">external documentation</a>. -spec setFaceName(This, FaceName) -> boolean() when - This::wxFont(), FaceName::string(). + This::wxFont(), FaceName::unicode:chardata(). setFaceName(#wx_ref{type=ThisT,ref=ThisRef},FaceName) when is_list(FaceName) -> ?CLASS(ThisT,wxFont), @@ -236,7 +236,7 @@ setWeight(#wx_ref{type=ThisT,ref=ThisRef},Weight) <<ThisRef:32/?UI,Weight:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFont) -> ok. +-spec destroy(This::wxFont()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFont), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxFontData.erl b/lib/wx/src/gen/wxFontData.erl index df8e734000..978d27b391 100644 --- a/lib/wx/src/gen/wxFontData.erl +++ b/lib/wx/src/gen/wxFontData.erl @@ -68,7 +68,7 @@ getAllowSymbols(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetcolour">external documentation</a>. --spec getColour(This) -> wx:wx_colour() when +-spec getColour(This) -> wx:wx_colour4() when This::wxFontData(). getColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFontData), @@ -162,7 +162,7 @@ setShowHelp(#wx_ref{type=ThisT,ref=ThisRef},Flag) <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFontData) -> ok. +-spec destroy(This::wxFontData()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFontData), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxFontDialog.erl b/lib/wx/src/gen/wxFontDialog.erl index ad061055da..6cc210a4aa 100644 --- a/lib/wx/src/gen/wxFontDialog.erl +++ b/lib/wx/src/gen/wxFontDialog.erl @@ -120,7 +120,7 @@ getFontData(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFontDialog) -> ok. +-spec destroy(This::wxFontDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFontDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxFontPickerCtrl.erl b/lib/wx/src/gen/wxFontPickerCtrl.erl index 01be91239c..2659d4e2e3 100644 --- a/lib/wx/src/gen/wxFontPickerCtrl.erl +++ b/lib/wx/src/gen/wxFontPickerCtrl.erl @@ -184,7 +184,7 @@ setMaxPointSize(#wx_ref{type=ThisT,ref=ThisRef},Max) <<ThisRef:32/?UI,Max:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFontPickerCtrl) -> ok. +-spec destroy(This::wxFontPickerCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFontPickerCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxFrame.erl b/lib/wx/src/gen/wxFrame.erl index 1618af137c..61f46f7a07 100644 --- a/lib/wx/src/gen/wxFrame.erl +++ b/lib/wx/src/gen/wxFrame.erl @@ -94,7 +94,7 @@ new() -> %% @equiv new(Parent,Id,Title, []) -spec new(Parent, Id, Title) -> wxFrame() when - Parent::wxWindow:wxWindow(), Id::integer(), Title::string(). + Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(). new(Parent,Id,Title) when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) -> @@ -102,7 +102,7 @@ new(Parent,Id,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframewxframe">external documentation</a>. -spec new(Parent, Id, Title, [Option]) -> wxFrame() when - Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), + Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -120,7 +120,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options) %% @equiv create(This,Parent,Id,Title, []) -spec create(This, Parent, Id, Title) -> boolean() when - This::wxFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(). + This::wxFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(). create(This,Parent,Id,Title) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) -> @@ -128,7 +128,7 @@ create(This,Parent,Id,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframecreate">external documentation</a>. -spec create(This, Parent, Id, Title, [Option]) -> boolean() when - This::wxFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), + This::wxFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -279,7 +279,7 @@ setStatusBarPane(#wx_ref{type=ThisT,ref=ThisRef},N) %% @equiv setStatusText(This,Text, []) -spec setStatusText(This, Text) -> ok when - This::wxFrame(), Text::string(). + This::wxFrame(), Text::unicode:chardata(). setStatusText(This,Text) when is_record(This, wx_ref),is_list(Text) -> @@ -287,7 +287,7 @@ setStatusText(This,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetstatustext">external documentation</a>. -spec setStatusText(This, Text, [Option]) -> ok when - This::wxFrame(), Text::string(), + This::wxFrame(), Text::unicode:chardata(), Option :: {number, integer()}. setStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options) when is_list(Text),is_list(Options) -> @@ -319,7 +319,7 @@ setToolBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ToolbarT,ref=ToolbarRef} <<ThisRef:32/?UI,ToolbarRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxFrame) -> ok. +-spec destroy(This::wxFrame()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxFrame), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxGLCanvas.erl b/lib/wx/src/gen/wxGLCanvas.erl index 515ccab2ff..5c0bda7ee4 100644 --- a/lib/wx/src/gen/wxGLCanvas.erl +++ b/lib/wx/src/gen/wxGLCanvas.erl @@ -92,7 +92,7 @@ new(Parent) | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} - | {name, string()} + | {name, unicode:chardata()} | {attribList, [integer()]} | {palette, wxPalette:wxPalette()}. @@ -122,7 +122,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options) | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} - | {name, string()} + | {name, unicode:chardata()} | {attribList, [integer()]} | {palette, wxPalette:wxPalette()}. new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=SharedT,ref=SharedRef}, Options) @@ -174,7 +174,7 @@ swapBuffers(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGLCanvas) -> ok. +-spec destroy(This::wxGLCanvas()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGLCanvas), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxGauge.erl b/lib/wx/src/gen/wxGauge.erl index bb453b4a8b..c35a2574f6 100644 --- a/lib/wx/src/gen/wxGauge.erl +++ b/lib/wx/src/gen/wxGauge.erl @@ -225,7 +225,7 @@ pulse(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGauge) -> ok. +-spec destroy(This::wxGauge()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGauge), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxGenericDirCtrl.erl b/lib/wx/src/gen/wxGenericDirCtrl.erl index 6ea26e0426..cb917e8fd1 100644 --- a/lib/wx/src/gen/wxGenericDirCtrl.erl +++ b/lib/wx/src/gen/wxGenericDirCtrl.erl @@ -98,11 +98,11 @@ new(Parent) -spec new(Parent, [Option]) -> wxGenericDirCtrl() when Parent::wxWindow:wxWindow(), Option :: {id, integer()} - | {dir, string()} + | {dir, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} - | {filter, string()} + | {filter, unicode:chardata()} | {defaultFilter, integer()}. new(#wx_ref{type=ParentT,ref=ParentRef}, Options) when is_list(Options) -> @@ -131,11 +131,11 @@ create(This,Parent) -spec create(This, Parent, [Option]) -> boolean() when This::wxGenericDirCtrl(), Parent::wxWindow:wxWindow(), Option :: {id, integer()} - | {dir, string()} + | {dir, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} - | {filter, string()} + | {filter, unicode:chardata()} | {defaultFilter, integer()}. create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options) when is_list(Options) -> @@ -171,7 +171,7 @@ collapseTree(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlexpandpath">external documentation</a>. -spec expandPath(This, Path) -> boolean() when - This::wxGenericDirCtrl(), Path::string(). + This::wxGenericDirCtrl(), Path::unicode:chardata(). expandPath(#wx_ref{type=ThisT,ref=ThisRef},Path) when is_list(Path) -> ?CLASS(ThisT,wxGenericDirCtrl), @@ -180,7 +180,7 @@ expandPath(#wx_ref{type=ThisT,ref=ThisRef},Path) <<ThisRef:32/?UI,(byte_size(Path_UC)):32/?UI,(Path_UC)/binary, 0:(((8- ((0+byte_size(Path_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetdefaultpath">external documentation</a>. --spec getDefaultPath(This) -> string() when +-spec getDefaultPath(This) -> unicode:charlist() when This::wxGenericDirCtrl(). getDefaultPath(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGenericDirCtrl), @@ -188,7 +188,7 @@ getDefaultPath(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetpath">external documentation</a>. --spec getPath(This) -> string() when +-spec getPath(This) -> unicode:charlist() when This::wxGenericDirCtrl(). getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGenericDirCtrl), @@ -196,7 +196,7 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilepath">external documentation</a>. --spec getFilePath(This) -> string() when +-spec getFilePath(This) -> unicode:charlist() when This::wxGenericDirCtrl(). getFilePath(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGenericDirCtrl), @@ -204,7 +204,7 @@ getFilePath(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilter">external documentation</a>. --spec getFilter(This) -> string() when +-spec getFilter(This) -> unicode:charlist() when This::wxGenericDirCtrl(). getFilter(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGenericDirCtrl), @@ -245,7 +245,7 @@ reCreateTree(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetdefaultpath">external documentation</a>. -spec setDefaultPath(This, Path) -> ok when - This::wxGenericDirCtrl(), Path::string(). + This::wxGenericDirCtrl(), Path::unicode:chardata(). setDefaultPath(#wx_ref{type=ThisT,ref=ThisRef},Path) when is_list(Path) -> ?CLASS(ThisT,wxGenericDirCtrl), @@ -255,7 +255,7 @@ setDefaultPath(#wx_ref{type=ThisT,ref=ThisRef},Path) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetfilter">external documentation</a>. -spec setFilter(This, Filter) -> ok when - This::wxGenericDirCtrl(), Filter::string(). + This::wxGenericDirCtrl(), Filter::unicode:chardata(). setFilter(#wx_ref{type=ThisT,ref=ThisRef},Filter) when is_list(Filter) -> ?CLASS(ThisT,wxGenericDirCtrl), @@ -274,7 +274,7 @@ setFilterIndex(#wx_ref{type=ThisT,ref=ThisRef},N) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetpath">external documentation</a>. -spec setPath(This, Path) -> ok when - This::wxGenericDirCtrl(), Path::string(). + This::wxGenericDirCtrl(), Path::unicode:chardata(). setPath(#wx_ref{type=ThisT,ref=ThisRef},Path) when is_list(Path) -> ?CLASS(ThisT,wxGenericDirCtrl), @@ -283,7 +283,7 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Path) <<ThisRef:32/?UI,(byte_size(Path_UC)):32/?UI,(Path_UC)/binary, 0:(((8- ((0+byte_size(Path_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGenericDirCtrl) -> ok. +-spec destroy(This::wxGenericDirCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGenericDirCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxGraphicsContext.erl b/lib/wx/src/gen/wxGraphicsContext.erl index 3b5c554740..db69c278a7 100644 --- a/lib/wx/src/gen/wxGraphicsContext.erl +++ b/lib/wx/src/gen/wxGraphicsContext.erl @@ -280,7 +280,7 @@ drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H,Radius) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>. -spec drawText(This, Str, X, Y) -> ok when - This::wxGraphicsContext(), Str::string(), X::number(), Y::number(). + This::wxGraphicsContext(), Str::unicode:chardata(), X::number(), Y::number(). drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y) when is_list(Str),is_number(X),is_number(Y) -> ?CLASS(ThisT,wxGraphicsContext), @@ -290,9 +290,9 @@ drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>. -spec drawText(This, Str, X, Y, Angle) -> ok when - This::wxGraphicsContext(), Str::string(), X::number(), Y::number(), Angle::number(); + This::wxGraphicsContext(), Str::unicode:chardata(), X::number(), Y::number(), Angle::number(); (This, Str, X, Y, BackgroundBrush) -> ok when - This::wxGraphicsContext(), Str::string(), X::number(), Y::number(), BackgroundBrush::wxGraphicsBrush:wxGraphicsBrush(). + This::wxGraphicsContext(), Str::unicode:chardata(), X::number(), Y::number(), BackgroundBrush::wxGraphicsBrush:wxGraphicsBrush(). drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y,Angle) when is_list(Str),is_number(X),is_number(Y),is_number(Angle) -> ?CLASS(ThisT,wxGraphicsContext), @@ -309,7 +309,7 @@ drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y,#wx_ref{type=BackgroundBrushT,r %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>. -spec drawText(This, Str, X, Y, Angle, BackgroundBrush) -> ok when - This::wxGraphicsContext(), Str::string(), X::number(), Y::number(), Angle::number(), BackgroundBrush::wxGraphicsBrush:wxGraphicsBrush(). + This::wxGraphicsContext(), Str::unicode:chardata(), X::number(), Y::number(), Angle::number(), BackgroundBrush::wxGraphicsBrush:wxGraphicsBrush(). drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y,Angle,#wx_ref{type=BackgroundBrushT,ref=BackgroundBrushRef}) when is_list(Str),is_number(X),is_number(Y),is_number(Angle) -> ?CLASS(ThisT,wxGraphicsContext), @@ -351,7 +351,7 @@ strokePath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextgetpartialtextextents">external documentation</a>. -spec getPartialTextExtents(This, Text) -> [number()] when - This::wxGraphicsContext(), Text::string(). + This::wxGraphicsContext(), Text::unicode:chardata(). getPartialTextExtents(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxGraphicsContext), @@ -362,7 +362,7 @@ getPartialTextExtents(#wx_ref{type=ThisT,ref=ThisRef},Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextgettextextent">external documentation</a>. -spec getTextExtent(This, Text) -> Result when Result ::{Width::number(), Height::number(), Descent::number(), ExternalLeading::number()}, - This::wxGraphicsContext(), Text::string(). + This::wxGraphicsContext(), Text::unicode:chardata(). getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxGraphicsContext), @@ -490,7 +490,7 @@ strokeLines(#wx_ref{type=ThisT,ref=ThisRef},Points) (<< <<X:64/?F,Y:64/?F>> || {X,Y} <- Points>>)/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGraphicsContext) -> ok. +-spec destroy(This::wxGraphicsContext()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGraphicsContext), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxGraphicsObject.erl b/lib/wx/src/gen/wxGraphicsObject.erl index b8b4be1dea..857a398e1f 100644 --- a/lib/wx/src/gen/wxGraphicsObject.erl +++ b/lib/wx/src/gen/wxGraphicsObject.erl @@ -51,7 +51,7 @@ isNull(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGraphicsObject) -> ok. +-spec destroy(This::wxGraphicsObject()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGraphicsObject), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxGrid.erl b/lib/wx/src/gen/wxGrid.erl index ab4ec3a44a..dd85c7b46d 100644 --- a/lib/wx/src/gen/wxGrid.erl +++ b/lib/wx/src/gen/wxGrid.erl @@ -669,7 +669,7 @@ getCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Row,Col) <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellbackgroundcolour">external documentation</a>. --spec getCellBackgroundColour(This, Row, Col) -> wx:wx_colour() when +-spec getCellBackgroundColour(This, Row, Col) -> wx:wx_colour4() when This::wxGrid(), Row::integer(), Col::integer(). getCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col) when is_integer(Row),is_integer(Col) -> @@ -705,7 +705,7 @@ getCellRenderer(#wx_ref{type=ThisT,ref=ThisRef},Row,Col) <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcelltextcolour">external documentation</a>. --spec getCellTextColour(This, Row, Col) -> wx:wx_colour() when +-spec getCellTextColour(This, Row, Col) -> wx:wx_colour4() when This::wxGrid(), Row::integer(), Col::integer(). getCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col) when is_integer(Row),is_integer(Col) -> @@ -714,7 +714,7 @@ getCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col) <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellvalue">external documentation</a>. --spec getCellValue(This, Coords) -> string() when +-spec getCellValue(This, Coords) -> unicode:charlist() when This::wxGrid(), Coords::{R::integer(), C::integer()}. getCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC}) when is_integer(CoordsR),is_integer(CoordsC) -> @@ -723,7 +723,7 @@ getCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC}) <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellvalue">external documentation</a>. --spec getCellValue(This, Row, Col) -> string() when +-spec getCellValue(This, Row, Col) -> unicode:charlist() when This::wxGrid(), Row::integer(), Col::integer(). getCellValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Col) when is_integer(Row),is_integer(Col) -> @@ -748,7 +748,7 @@ getColLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcollabelvalue">external documentation</a>. --spec getColLabelValue(This, Col) -> string() when +-spec getColLabelValue(This, Col) -> unicode:charlist() when This::wxGrid(), Col::integer(). getColLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Col) when is_integer(Col) -> @@ -773,7 +773,7 @@ getDefaultCellAlignment(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcellbackgroundcolour">external documentation</a>. --spec getDefaultCellBackgroundColour(This) -> wx:wx_colour() when +-spec getDefaultCellBackgroundColour(This) -> wx:wx_colour4() when This::wxGrid(). getDefaultCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGrid), @@ -789,7 +789,7 @@ getDefaultCellFont(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcelltextcolour">external documentation</a>. --spec getDefaultCellTextColour(This) -> wx:wx_colour() when +-spec getDefaultCellTextColour(This) -> wx:wx_colour4() when This::wxGrid(). getDefaultCellTextColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGrid), @@ -840,7 +840,7 @@ getDefaultEditorForCell(#wx_ref{type=ThisT,ref=ThisRef},Row,Col) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaulteditorfortype">external documentation</a>. -spec getDefaultEditorForType(This, TypeName) -> wxGridCellEditor:wxGridCellEditor() when - This::wxGrid(), TypeName::string(). + This::wxGrid(), TypeName::unicode:chardata(). getDefaultEditorForType(#wx_ref{type=ThisT,ref=ThisRef},TypeName) when is_list(TypeName) -> ?CLASS(ThisT,wxGrid), @@ -867,7 +867,7 @@ getDefaultRendererForCell(#wx_ref{type=ThisT,ref=ThisRef},Row,Col) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrendererfortype">external documentation</a>. -spec getDefaultRendererForType(This, TypeName) -> wxGridCellRenderer:wxGridCellRenderer() when - This::wxGrid(), TypeName::string(). + This::wxGrid(), TypeName::unicode:chardata(). getDefaultRendererForType(#wx_ref{type=ThisT,ref=ThisRef},TypeName) when is_list(TypeName) -> ?CLASS(ThisT,wxGrid), @@ -908,7 +908,7 @@ getGridCursorRow(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridlinecolour">external documentation</a>. --spec getGridLineColour(This) -> wx:wx_colour() when +-spec getGridLineColour(This) -> wx:wx_colour4() when This::wxGrid(). getGridLineColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGrid), @@ -924,7 +924,7 @@ gridLinesEnabled(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetlabelbackgroundcolour">external documentation</a>. --spec getLabelBackgroundColour(This) -> wx:wx_colour() when +-spec getLabelBackgroundColour(This) -> wx:wx_colour4() when This::wxGrid(). getLabelBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGrid), @@ -940,7 +940,7 @@ getLabelFont(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetlabeltextcolour">external documentation</a>. --spec getLabelTextColour(This) -> wx:wx_colour() when +-spec getLabelTextColour(This) -> wx:wx_colour4() when This::wxGrid(). getLabelTextColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGrid), @@ -997,7 +997,7 @@ getRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowlabelvalue">external documentation</a>. --spec getRowLabelValue(This, Row) -> string() when +-spec getRowLabelValue(This, Row) -> unicode:charlist() when This::wxGrid(), Row::integer(). getRowLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Row) when is_integer(Row) -> @@ -1055,7 +1055,7 @@ getSelectedRows(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectionbackground">external documentation</a>. --spec getSelectionBackground(This) -> wx:wx_colour() when +-spec getSelectionBackground(This) -> wx:wx_colour4() when This::wxGrid(). getSelectionBackground(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGrid), @@ -1079,7 +1079,7 @@ getSelectionBlockBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectionforeground">external documentation</a>. --spec getSelectionForeground(This) -> wx:wx_colour() when +-spec getSelectionForeground(This) -> wx:wx_colour4() when This::wxGrid(). getSelectionForeground(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGrid), @@ -1391,7 +1391,7 @@ movePageUp(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridregisterdatatype">external documentation</a>. -spec registerDataType(This, TypeName, Renderer, Editor) -> ok when - This::wxGrid(), TypeName::string(), Renderer::wxGridCellRenderer:wxGridCellRenderer(), Editor::wxGridCellEditor:wxGridCellEditor(). + This::wxGrid(), TypeName::unicode:chardata(), Renderer::wxGridCellRenderer:wxGridCellRenderer(), Editor::wxGridCellEditor:wxGridCellEditor(). registerDataType(#wx_ref{type=ThisT,ref=ThisRef},TypeName,#wx_ref{type=RendererT,ref=RendererRef},#wx_ref{type=EditorT,ref=EditorRef}) when is_list(TypeName) -> ?CLASS(ThisT,wxGrid), @@ -1610,7 +1610,7 @@ setCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Val,Row,Col) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellvalue">external documentation</a>. -spec setCellValue(This, Coords, S) -> ok when - This::wxGrid(), Coords::{R::integer(), C::integer()}, S::string(). + This::wxGrid(), Coords::{R::integer(), C::integer()}, S::unicode:chardata(). setCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC},S) when is_integer(CoordsR),is_integer(CoordsC),is_list(S) -> ?CLASS(ThisT,wxGrid), @@ -1620,9 +1620,9 @@ setCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC},S) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellvalue">external documentation</a>. -spec setCellValue(This, Row, Col, S) -> ok when - This::wxGrid(), Row::integer(), Col::integer(), S::string(); + This::wxGrid(), Row::integer(), Col::integer(), S::unicode:chardata(); (This, Val, Row, Col) -> ok when - This::wxGrid(), Val::string(), Row::integer(), Col::integer(). + This::wxGrid(), Val::unicode:chardata(), Row::integer(), Col::integer(). setCellValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,S) when is_integer(Row),is_integer(Col),is_list(S) -> ?CLASS(ThisT,wxGrid), @@ -1689,7 +1689,7 @@ setColFormatFloat(#wx_ref{type=ThisT,ref=ThisRef},Col, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolformatcustom">external documentation</a>. -spec setColFormatCustom(This, Col, TypeName) -> ok when - This::wxGrid(), Col::integer(), TypeName::string(). + This::wxGrid(), Col::integer(), TypeName::unicode:chardata(). setColFormatCustom(#wx_ref{type=ThisT,ref=ThisRef},Col,TypeName) when is_integer(Col),is_list(TypeName) -> ?CLASS(ThisT,wxGrid), @@ -1717,7 +1717,7 @@ setColLabelSize(#wx_ref{type=ThisT,ref=ThisRef},Height) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcollabelvalue">external documentation</a>. -spec setColLabelValue(This, Col, Val) -> ok when - This::wxGrid(), Col::integer(), Val::string(). + This::wxGrid(), Col::integer(), Val::unicode:chardata(). setColLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Col,Val) when is_integer(Col),is_list(Val) -> ?CLASS(ThisT,wxGrid), @@ -1953,7 +1953,7 @@ setRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef},Width) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowlabelvalue">external documentation</a>. -spec setRowLabelValue(This, Row, Val) -> ok when - This::wxGrid(), Row::integer(), Val::string(). + This::wxGrid(), Row::integer(), Val::unicode:chardata(). setRowLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Val) when is_integer(Row),is_list(Val) -> ?CLASS(ThisT,wxGrid), @@ -2091,7 +2091,7 @@ yToRow(#wx_ref{type=ThisT,ref=ThisRef},Y) <<ThisRef:32/?UI,Y:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGrid) -> ok. +-spec destroy(This::wxGrid()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGrid), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxGridBagSizer.erl b/lib/wx/src/gen/wxGridBagSizer.erl index 10d87d0a4e..4eea673c93 100644 --- a/lib/wx/src/gen/wxGridBagSizer.erl +++ b/lib/wx/src/gen/wxGridBagSizer.erl @@ -396,7 +396,7 @@ setItemSpan(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, <<ThisRef:32/?UI,WindowRef:32/?UI,SpanRS:32/?UI,SpanCS:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridBagSizer) -> ok. +-spec destroy(This::wxGridBagSizer()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridBagSizer), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxGridCellAttr.erl b/lib/wx/src/gen/wxGridCellAttr.erl index 896bf97489..f03fd99d2a 100644 --- a/lib/wx/src/gen/wxGridCellAttr.erl +++ b/lib/wx/src/gen/wxGridCellAttr.erl @@ -162,7 +162,7 @@ hasEditor(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgettextcolour">external documentation</a>. --spec getTextColour(This) -> wx:wx_colour() when +-spec getTextColour(This) -> wx:wx_colour4() when This::wxGridCellAttr(). getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGridCellAttr), @@ -170,7 +170,7 @@ getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgetbackgroundcolour">external documentation</a>. --spec getBackgroundColour(This) -> wx:wx_colour() when +-spec getBackgroundColour(This) -> wx:wx_colour4() when This::wxGridCellAttr(). getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGridCellAttr), diff --git a/lib/wx/src/gen/wxGridCellBoolEditor.erl b/lib/wx/src/gen/wxGridCellBoolEditor.erl index c4a68ac597..533554cd54 100644 --- a/lib/wx/src/gen/wxGridCellBoolEditor.erl +++ b/lib/wx/src/gen/wxGridCellBoolEditor.erl @@ -47,7 +47,7 @@ new() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellbooleditor.html#wxgridcellbooleditoristruevalue">external documentation</a>. -spec isTrueValue(Value) -> boolean() when - Value::string(). + Value::unicode:chardata(). isTrueValue(Value) when is_list(Value) -> Value_UC = unicode:characters_to_binary([Value,0]), @@ -62,8 +62,8 @@ useStringValues() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellbooleditor.html#wxgridcellbooleditorusestringvalues">external documentation</a>. -spec useStringValues([Option]) -> ok when - Option :: {valueTrue, string()} - | {valueFalse, string()}. + Option :: {valueTrue, unicode:chardata()} + | {valueFalse, unicode:chardata()}. useStringValues(Options) when is_list(Options) -> MOpts = fun({valueTrue, ValueTrue}, Acc) -> ValueTrue_UC = unicode:characters_to_binary([ValueTrue,0]),[<<1:32/?UI,(byte_size(ValueTrue_UC)):32/?UI,(ValueTrue_UC)/binary, 0:(((8- ((0+byte_size(ValueTrue_UC)) band 16#7)) band 16#7))/unit:8>>|Acc]; @@ -74,7 +74,7 @@ useStringValues(Options) <<BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridCellBoolEditor) -> ok. +-spec destroy(This::wxGridCellBoolEditor()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridCellBoolEditor), wxe_util:destroy(?wxGridCellBoolEditor_destroy,Obj), diff --git a/lib/wx/src/gen/wxGridCellBoolRenderer.erl b/lib/wx/src/gen/wxGridCellBoolRenderer.erl index ae9d4baf47..834f00a623 100644 --- a/lib/wx/src/gen/wxGridCellBoolRenderer.erl +++ b/lib/wx/src/gen/wxGridCellBoolRenderer.erl @@ -45,7 +45,7 @@ new() -> <<>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridCellBoolRenderer) -> ok. +-spec destroy(This::wxGridCellBoolRenderer()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridCellBoolRenderer), wxe_util:destroy(?wxGridCellBoolRenderer_destroy,Obj), diff --git a/lib/wx/src/gen/wxGridCellChoiceEditor.erl b/lib/wx/src/gen/wxGridCellChoiceEditor.erl index d8ed206f07..6f7d7ceffb 100644 --- a/lib/wx/src/gen/wxGridCellChoiceEditor.erl +++ b/lib/wx/src/gen/wxGridCellChoiceEditor.erl @@ -41,7 +41,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxGridCellChoiceEditor() :: wx:wx_object(). %% @equiv new(Choices, []) -spec new(Choices) -> wxGridCellChoiceEditor() when - Choices::[[string()]]. + Choices::[[unicode:chardata()]]. new(Choices) when is_list(Choices) -> @@ -49,7 +49,7 @@ new(Choices) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellchoiceeditor.html#wxgridcellchoiceeditorwxgridcellchoiceeditor">external documentation</a>. -spec new(Choices, [Option]) -> wxGridCellChoiceEditor() when - Choices::[[string()]], + Choices::[[unicode:chardata()]], Option :: {allowOthers, boolean()}. new(Choices, Options) when is_list(Choices),is_list(Options) -> @@ -63,7 +63,7 @@ new(Choices, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellchoiceeditor.html#wxgridcellchoiceeditorsetparameters">external documentation</a>. -spec setParameters(This, Params) -> ok when - This::wxGridCellChoiceEditor(), Params::string(). + This::wxGridCellChoiceEditor(), Params::unicode:chardata(). setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params) when is_list(Params) -> ?CLASS(ThisT,wxGridCellChoiceEditor), @@ -72,7 +72,7 @@ setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params) <<ThisRef:32/?UI,(byte_size(Params_UC)):32/?UI,(Params_UC)/binary, 0:(((8- ((0+byte_size(Params_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridCellChoiceEditor) -> ok. +-spec destroy(This::wxGridCellChoiceEditor()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridCellChoiceEditor), wxe_util:destroy(?wxGridCellChoiceEditor_destroy,Obj), diff --git a/lib/wx/src/gen/wxGridCellFloatEditor.erl b/lib/wx/src/gen/wxGridCellFloatEditor.erl index ebb5aa04d4..f6b7dce15e 100644 --- a/lib/wx/src/gen/wxGridCellFloatEditor.erl +++ b/lib/wx/src/gen/wxGridCellFloatEditor.erl @@ -60,7 +60,7 @@ new(Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloateditor.html#wxgridcellfloateditorsetparameters">external documentation</a>. -spec setParameters(This, Params) -> ok when - This::wxGridCellFloatEditor(), Params::string(). + This::wxGridCellFloatEditor(), Params::unicode:chardata(). setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params) when is_list(Params) -> ?CLASS(ThisT,wxGridCellFloatEditor), @@ -69,7 +69,7 @@ setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params) <<ThisRef:32/?UI,(byte_size(Params_UC)):32/?UI,(Params_UC)/binary, 0:(((8- ((0+byte_size(Params_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridCellFloatEditor) -> ok. +-spec destroy(This::wxGridCellFloatEditor()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridCellFloatEditor), wxe_util:destroy(?wxGridCellFloatEditor_destroy,Obj), diff --git a/lib/wx/src/gen/wxGridCellFloatRenderer.erl b/lib/wx/src/gen/wxGridCellFloatRenderer.erl index 4e3450c90b..c090a60e74 100644 --- a/lib/wx/src/gen/wxGridCellFloatRenderer.erl +++ b/lib/wx/src/gen/wxGridCellFloatRenderer.erl @@ -78,7 +78,7 @@ getWidth(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderersetparameters">external documentation</a>. -spec setParameters(This, Params) -> ok when - This::wxGridCellFloatRenderer(), Params::string(). + This::wxGridCellFloatRenderer(), Params::unicode:chardata(). setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params) when is_list(Params) -> ?CLASS(ThisT,wxGridCellFloatRenderer), @@ -105,7 +105,7 @@ setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width) <<ThisRef:32/?UI,Width:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridCellFloatRenderer) -> ok. +-spec destroy(This::wxGridCellFloatRenderer()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridCellFloatRenderer), wxe_util:destroy(?wxGridCellFloatRenderer_destroy,Obj), diff --git a/lib/wx/src/gen/wxGridCellNumberEditor.erl b/lib/wx/src/gen/wxGridCellNumberEditor.erl index c3ac0c41d5..68d5670367 100644 --- a/lib/wx/src/gen/wxGridCellNumberEditor.erl +++ b/lib/wx/src/gen/wxGridCellNumberEditor.erl @@ -61,7 +61,7 @@ new(Options) <<BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorgetvalue">external documentation</a>. --spec getValue(This) -> string() when +-spec getValue(This) -> unicode:charlist() when This::wxGridCellNumberEditor(). getValue(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGridCellNumberEditor), @@ -70,7 +70,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorsetparameters">external documentation</a>. -spec setParameters(This, Params) -> ok when - This::wxGridCellNumberEditor(), Params::string(). + This::wxGridCellNumberEditor(), Params::unicode:chardata(). setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params) when is_list(Params) -> ?CLASS(ThisT,wxGridCellNumberEditor), @@ -79,7 +79,7 @@ setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params) <<ThisRef:32/?UI,(byte_size(Params_UC)):32/?UI,(Params_UC)/binary, 0:(((8- ((0+byte_size(Params_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridCellNumberEditor) -> ok. +-spec destroy(This::wxGridCellNumberEditor()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridCellNumberEditor), wxe_util:destroy(?wxGridCellNumberEditor_destroy,Obj), diff --git a/lib/wx/src/gen/wxGridCellNumberRenderer.erl b/lib/wx/src/gen/wxGridCellNumberRenderer.erl index 5d5bd89960..b02b6d48c9 100644 --- a/lib/wx/src/gen/wxGridCellNumberRenderer.erl +++ b/lib/wx/src/gen/wxGridCellNumberRenderer.erl @@ -47,7 +47,7 @@ new() -> <<>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridCellNumberRenderer) -> ok. +-spec destroy(This::wxGridCellNumberRenderer()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridCellNumberRenderer), wxe_util:destroy(?wxGridCellNumberRenderer_destroy,Obj), diff --git a/lib/wx/src/gen/wxGridCellStringRenderer.erl b/lib/wx/src/gen/wxGridCellStringRenderer.erl index 36887a3d52..78fdf558a2 100644 --- a/lib/wx/src/gen/wxGridCellStringRenderer.erl +++ b/lib/wx/src/gen/wxGridCellStringRenderer.erl @@ -45,7 +45,7 @@ new() -> <<>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridCellStringRenderer) -> ok. +-spec destroy(This::wxGridCellStringRenderer()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridCellStringRenderer), wxe_util:destroy(?wxGridCellStringRenderer_destroy,Obj), diff --git a/lib/wx/src/gen/wxGridCellTextEditor.erl b/lib/wx/src/gen/wxGridCellTextEditor.erl index e849de7afd..44a324d5ea 100644 --- a/lib/wx/src/gen/wxGridCellTextEditor.erl +++ b/lib/wx/src/gen/wxGridCellTextEditor.erl @@ -47,7 +47,7 @@ new() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelltexteditor.html#wxgridcelltexteditorsetparameters">external documentation</a>. -spec setParameters(This, Params) -> ok when - This::wxGridCellTextEditor(), Params::string(). + This::wxGridCellTextEditor(), Params::unicode:chardata(). setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params) when is_list(Params) -> ?CLASS(ThisT,wxGridCellTextEditor), @@ -56,7 +56,7 @@ setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params) <<ThisRef:32/?UI,(byte_size(Params_UC)):32/?UI,(Params_UC)/binary, 0:(((8- ((0+byte_size(Params_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridCellTextEditor) -> ok. +-spec destroy(This::wxGridCellTextEditor()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridCellTextEditor), wxe_util:destroy(?wxGridCellTextEditor_destroy,Obj), diff --git a/lib/wx/src/gen/wxGridSizer.erl b/lib/wx/src/gen/wxGridSizer.erl index 0893105352..10c905f041 100644 --- a/lib/wx/src/gen/wxGridSizer.erl +++ b/lib/wx/src/gen/wxGridSizer.erl @@ -146,7 +146,7 @@ setVGap(#wx_ref{type=ThisT,ref=ThisRef},Gap) <<ThisRef:32/?UI,Gap:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxGridSizer) -> ok. +-spec destroy(This::wxGridSizer()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxGridSizer), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxHtmlEasyPrinting.erl b/lib/wx/src/gen/wxHtmlEasyPrinting.erl index 5f1f55af64..2a5506053b 100644 --- a/lib/wx/src/gen/wxHtmlEasyPrinting.erl +++ b/lib/wx/src/gen/wxHtmlEasyPrinting.erl @@ -45,7 +45,7 @@ new() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingwxhtmleasyprinting">external documentation</a>. -spec new([Option]) -> wxHtmlEasyPrinting() when - Option :: {name, string()} + Option :: {name, unicode:chardata()} | {parentWindow, wxWindow:wxWindow()}. new(Options) when is_list(Options) -> @@ -74,7 +74,7 @@ getPageSetupData(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpreviewfile">external documentation</a>. -spec previewFile(This, Htmlfile) -> boolean() when - This::wxHtmlEasyPrinting(), Htmlfile::string(). + This::wxHtmlEasyPrinting(), Htmlfile::unicode:chardata(). previewFile(#wx_ref{type=ThisT,ref=ThisRef},Htmlfile) when is_list(Htmlfile) -> ?CLASS(ThisT,wxHtmlEasyPrinting), @@ -84,7 +84,7 @@ previewFile(#wx_ref{type=ThisT,ref=ThisRef},Htmlfile) %% @equiv previewText(This,Htmltext, []) -spec previewText(This, Htmltext) -> boolean() when - This::wxHtmlEasyPrinting(), Htmltext::string(). + This::wxHtmlEasyPrinting(), Htmltext::unicode:chardata(). previewText(This,Htmltext) when is_record(This, wx_ref),is_list(Htmltext) -> @@ -92,8 +92,8 @@ previewText(This,Htmltext) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpreviewtext">external documentation</a>. -spec previewText(This, Htmltext, [Option]) -> boolean() when - This::wxHtmlEasyPrinting(), Htmltext::string(), - Option :: {basepath, string()}. + This::wxHtmlEasyPrinting(), Htmltext::unicode:chardata(), + Option :: {basepath, unicode:chardata()}. previewText(#wx_ref{type=ThisT,ref=ThisRef},Htmltext, Options) when is_list(Htmltext),is_list(Options) -> ?CLASS(ThisT,wxHtmlEasyPrinting), @@ -106,7 +106,7 @@ previewText(#wx_ref{type=ThisT,ref=ThisRef},Htmltext, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingprintfile">external documentation</a>. -spec printFile(This, Htmlfile) -> boolean() when - This::wxHtmlEasyPrinting(), Htmlfile::string(). + This::wxHtmlEasyPrinting(), Htmlfile::unicode:chardata(). printFile(#wx_ref{type=ThisT,ref=ThisRef},Htmlfile) when is_list(Htmlfile) -> ?CLASS(ThisT,wxHtmlEasyPrinting), @@ -116,7 +116,7 @@ printFile(#wx_ref{type=ThisT,ref=ThisRef},Htmlfile) %% @equiv printText(This,Htmltext, []) -spec printText(This, Htmltext) -> boolean() when - This::wxHtmlEasyPrinting(), Htmltext::string(). + This::wxHtmlEasyPrinting(), Htmltext::unicode:chardata(). printText(This,Htmltext) when is_record(This, wx_ref),is_list(Htmltext) -> @@ -124,8 +124,8 @@ printText(This,Htmltext) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingprinttext">external documentation</a>. -spec printText(This, Htmltext, [Option]) -> boolean() when - This::wxHtmlEasyPrinting(), Htmltext::string(), - Option :: {basepath, string()}. + This::wxHtmlEasyPrinting(), Htmltext::unicode:chardata(), + Option :: {basepath, unicode:chardata()}. printText(#wx_ref{type=ThisT,ref=ThisRef},Htmltext, Options) when is_list(Htmltext),is_list(Options) -> ?CLASS(ThisT,wxHtmlEasyPrinting), @@ -146,7 +146,7 @@ pageSetup(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @equiv setFonts(This,Normal_face,Fixed_face, []) -spec setFonts(This, Normal_face, Fixed_face) -> ok when - This::wxHtmlEasyPrinting(), Normal_face::string(), Fixed_face::string(). + This::wxHtmlEasyPrinting(), Normal_face::unicode:chardata(), Fixed_face::unicode:chardata(). setFonts(This,Normal_face,Fixed_face) when is_record(This, wx_ref),is_list(Normal_face),is_list(Fixed_face) -> @@ -154,7 +154,7 @@ setFonts(This,Normal_face,Fixed_face) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetfonts">external documentation</a>. -spec setFonts(This, Normal_face, Fixed_face, [Option]) -> ok when - This::wxHtmlEasyPrinting(), Normal_face::string(), Fixed_face::string(), + This::wxHtmlEasyPrinting(), Normal_face::unicode:chardata(), Fixed_face::unicode:chardata(), Option :: {sizes, [integer()]}. setFonts(#wx_ref{type=ThisT,ref=ThisRef},Normal_face,Fixed_face, Options) when is_list(Normal_face),is_list(Fixed_face),is_list(Options) -> @@ -170,7 +170,7 @@ setFonts(#wx_ref{type=ThisT,ref=ThisRef},Normal_face,Fixed_face, Options) %% @equiv setHeader(This,Header, []) -spec setHeader(This, Header) -> ok when - This::wxHtmlEasyPrinting(), Header::string(). + This::wxHtmlEasyPrinting(), Header::unicode:chardata(). setHeader(This,Header) when is_record(This, wx_ref),is_list(Header) -> @@ -178,7 +178,7 @@ setHeader(This,Header) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetheader">external documentation</a>. -spec setHeader(This, Header, [Option]) -> ok when - This::wxHtmlEasyPrinting(), Header::string(), + This::wxHtmlEasyPrinting(), Header::unicode:chardata(), Option :: {pg, integer()}. setHeader(#wx_ref{type=ThisT,ref=ThisRef},Header, Options) when is_list(Header),is_list(Options) -> @@ -192,7 +192,7 @@ setHeader(#wx_ref{type=ThisT,ref=ThisRef},Header, Options) %% @equiv setFooter(This,Footer, []) -spec setFooter(This, Footer) -> ok when - This::wxHtmlEasyPrinting(), Footer::string(). + This::wxHtmlEasyPrinting(), Footer::unicode:chardata(). setFooter(This,Footer) when is_record(This, wx_ref),is_list(Footer) -> @@ -200,7 +200,7 @@ setFooter(This,Footer) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetfooter">external documentation</a>. -spec setFooter(This, Footer, [Option]) -> ok when - This::wxHtmlEasyPrinting(), Footer::string(), + This::wxHtmlEasyPrinting(), Footer::unicode:chardata(), Option :: {pg, integer()}. setFooter(#wx_ref{type=ThisT,ref=ThisRef},Footer, Options) when is_list(Footer),is_list(Options) -> @@ -213,7 +213,7 @@ setFooter(#wx_ref{type=ThisT,ref=ThisRef},Footer, Options) <<ThisRef:32/?UI,(byte_size(Footer_UC)):32/?UI,(Footer_UC)/binary, 0:(((8- ((0+byte_size(Footer_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxHtmlEasyPrinting) -> ok. +-spec destroy(This::wxHtmlEasyPrinting()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxHtmlEasyPrinting), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxHtmlWindow.erl b/lib/wx/src/gen/wxHtmlWindow.erl index c8237ec31d..4820f7d075 100644 --- a/lib/wx/src/gen/wxHtmlWindow.erl +++ b/lib/wx/src/gen/wxHtmlWindow.erl @@ -123,7 +123,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowappendtopage">external documentation</a>. -spec appendToPage(This, Source) -> boolean() when - This::wxHtmlWindow(), Source::string(). + This::wxHtmlWindow(), Source::unicode:chardata(). appendToPage(#wx_ref{type=ThisT,ref=ThisRef},Source) when is_list(Source) -> ?CLASS(ThisT,wxHtmlWindow), @@ -132,7 +132,7 @@ appendToPage(#wx_ref{type=ThisT,ref=ThisRef},Source) <<ThisRef:32/?UI,(byte_size(Source_UC)):32/?UI,(Source_UC)/binary, 0:(((8- ((0+byte_size(Source_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedanchor">external documentation</a>. --spec getOpenedAnchor(This) -> string() when +-spec getOpenedAnchor(This) -> unicode:charlist() when This::wxHtmlWindow(). getOpenedAnchor(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxHtmlWindow), @@ -140,7 +140,7 @@ getOpenedAnchor(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedpage">external documentation</a>. --spec getOpenedPage(This) -> string() when +-spec getOpenedPage(This) -> unicode:charlist() when This::wxHtmlWindow(). getOpenedPage(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxHtmlWindow), @@ -148,7 +148,7 @@ getOpenedPage(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedpagetitle">external documentation</a>. --spec getOpenedPageTitle(This) -> string() when +-spec getOpenedPageTitle(This) -> unicode:charlist() when This::wxHtmlWindow(). getOpenedPageTitle(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxHtmlWindow), @@ -205,7 +205,7 @@ historyForward(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowloadfile">external documentation</a>. -spec loadFile(This, Filename) -> boolean() when - This::wxHtmlWindow(), Filename::string(). + This::wxHtmlWindow(), Filename::unicode:chardata(). loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename) when is_list(Filename) -> ?CLASS(ThisT,wxHtmlWindow), @@ -215,7 +215,7 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowloadpage">external documentation</a>. -spec loadPage(This, Location) -> boolean() when - This::wxHtmlWindow(), Location::string(). + This::wxHtmlWindow(), Location::unicode:chardata(). loadPage(#wx_ref{type=ThisT,ref=ThisRef},Location) when is_list(Location) -> ?CLASS(ThisT,wxHtmlWindow), @@ -232,7 +232,7 @@ selectAll(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowselectiontotext">external documentation</a>. --spec selectionToText(This) -> string() when +-spec selectionToText(This) -> unicode:charlist() when This::wxHtmlWindow(). selectionToText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxHtmlWindow), @@ -268,7 +268,7 @@ setBorders(#wx_ref{type=ThisT,ref=ThisRef},B) %% @equiv setFonts(This,Normal_face,Fixed_face, []) -spec setFonts(This, Normal_face, Fixed_face) -> ok when - This::wxHtmlWindow(), Normal_face::string(), Fixed_face::string(). + This::wxHtmlWindow(), Normal_face::unicode:chardata(), Fixed_face::unicode:chardata(). setFonts(This,Normal_face,Fixed_face) when is_record(This, wx_ref),is_list(Normal_face),is_list(Fixed_face) -> @@ -276,7 +276,7 @@ setFonts(This,Normal_face,Fixed_face) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetfonts">external documentation</a>. -spec setFonts(This, Normal_face, Fixed_face, [Option]) -> ok when - This::wxHtmlWindow(), Normal_face::string(), Fixed_face::string(), + This::wxHtmlWindow(), Normal_face::unicode:chardata(), Fixed_face::unicode:chardata(), Option :: {sizes, integer()}. setFonts(#wx_ref{type=ThisT,ref=ThisRef},Normal_face,Fixed_face, Options) when is_list(Normal_face),is_list(Fixed_face),is_list(Options) -> @@ -291,7 +291,7 @@ setFonts(#wx_ref{type=ThisT,ref=ThisRef},Normal_face,Fixed_face, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetpage">external documentation</a>. -spec setPage(This, Source) -> boolean() when - This::wxHtmlWindow(), Source::string(). + This::wxHtmlWindow(), Source::unicode:chardata(). setPage(#wx_ref{type=ThisT,ref=ThisRef},Source) when is_list(Source) -> ?CLASS(ThisT,wxHtmlWindow), @@ -301,7 +301,7 @@ setPage(#wx_ref{type=ThisT,ref=ThisRef},Source) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetrelatedframe">external documentation</a>. -spec setRelatedFrame(This, Frame, Format) -> ok when - This::wxHtmlWindow(), Frame::wxFrame:wxFrame(), Format::string(). + This::wxHtmlWindow(), Frame::wxFrame:wxFrame(), Format::unicode:chardata(). setRelatedFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef},Format) when is_list(Format) -> ?CLASS(ThisT,wxHtmlWindow), @@ -320,7 +320,7 @@ setRelatedStatusBar(#wx_ref{type=ThisT,ref=ThisRef},Bar) <<ThisRef:32/?UI,Bar:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowtotext">external documentation</a>. --spec toText(This) -> string() when +-spec toText(This) -> unicode:charlist() when This::wxHtmlWindow(). toText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxHtmlWindow), @@ -328,7 +328,7 @@ toText(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxHtmlWindow) -> ok. +-spec destroy(This::wxHtmlWindow()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxHtmlWindow), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxIcon.erl b/lib/wx/src/gen/wxIcon.erl index 0e218f9917..ac202130b3 100644 --- a/lib/wx/src/gen/wxIcon.erl +++ b/lib/wx/src/gen/wxIcon.erl @@ -49,7 +49,7 @@ new() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconwxicon">external documentation</a>. -spec new(Filename) -> wxIcon() when - Filename::string(); + Filename::unicode:chardata(); (Loc) -> wxIcon() when Loc::wx:wx(). @@ -64,7 +64,7 @@ new(#wx_ref{type=LocT,ref=LocRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconwxicon">external documentation</a>. %%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY -spec new(Filename, [Option]) -> wxIcon() when - Filename::string(), + Filename::unicode:chardata(), Option :: {type, wx:wx_enum()} | {desiredWidth, integer()} | {desiredHeight, integer()}. @@ -89,7 +89,7 @@ copyFromBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef}) -> <<ThisRef:32/?UI,BmpRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxIcon) -> ok. +-spec destroy(This::wxIcon()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxIcon), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxIconBundle.erl b/lib/wx/src/gen/wxIconBundle.erl index 4d4614f171..113511f3ee 100644 --- a/lib/wx/src/gen/wxIconBundle.erl +++ b/lib/wx/src/gen/wxIconBundle.erl @@ -55,7 +55,7 @@ new(#wx_ref{type=IcT,ref=IcRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundlewxiconbundle">external documentation</a>. -spec new(File, Type) -> wxIconBundle() when - File::string(), Type::integer(). + File::unicode:chardata(), Type::integer(). new(File,Type) when is_list(File),is_integer(Type) -> File_UC = unicode:characters_to_binary([File,0]), @@ -73,7 +73,7 @@ addIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundleaddicon">external documentation</a>. -spec addIcon(This, File, Type) -> ok when - This::wxIconBundle(), File::string(), Type::integer(). + This::wxIconBundle(), File::unicode:chardata(), Type::integer(). addIcon(#wx_ref{type=ThisT,ref=ThisRef},File,Type) when is_list(File),is_integer(Type) -> ?CLASS(ThisT,wxIconBundle), @@ -110,7 +110,7 @@ getIcon(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH}) <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxIconBundle) -> ok. +-spec destroy(This::wxIconBundle()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxIconBundle), wxe_util:destroy(?wxIconBundle_destruct,Obj), diff --git a/lib/wx/src/gen/wxImage.erl b/lib/wx/src/gen/wxImage.erl index 36d83ebadc..535133e665 100644 --- a/lib/wx/src/gen/wxImage.erl +++ b/lib/wx/src/gen/wxImage.erl @@ -60,7 +60,7 @@ new() -> %% @equiv new(Name, []) -spec new(Name) -> wxImage() when - Name::string(). + Name::unicode:chardata(). new(Name) when is_list(Name) -> @@ -70,7 +70,7 @@ new(Name) -spec new(Width, Height) -> wxImage() when Width::integer(), Height::integer(); (Name, [Option]) -> wxImage() when - Name::string(), + Name::unicode:chardata(), Option :: {type, integer()} | {index, integer()}. @@ -94,7 +94,7 @@ new(Name, Options) Width::integer(), Height::integer(), Option :: {clear, boolean()}; (Name, Mimetype, [Option]) -> wxImage() when - Name::string(), Mimetype::string(), + Name::unicode:chardata(), Mimetype::unicode:chardata(), Option :: {index, integer()}. new(Width,Height,Data) @@ -338,7 +338,7 @@ findFirstUnusedColour(#wx_ref{type=ThisT,ref=ThisRef}, Options) <<ThisRef:32/?UI, 0:32,BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetimageextwildcard">external documentation</a>. --spec getImageExtWildcard() -> string(). +-spec getImageExtWildcard() -> unicode:charlist(). getImageExtWildcard() -> wxe_util:call(?wxImage_GetImageExtWildcard, <<>>). @@ -388,7 +388,7 @@ getGreen(#wx_ref{type=ThisT,ref=ThisRef},X,Y) %% @equiv getImageCount(Name, []) -spec getImageCount(Name) -> integer() when - Name::string(). + Name::unicode:chardata(). getImageCount(Name) when is_list(Name) -> @@ -396,7 +396,7 @@ getImageCount(Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetimagecount">external documentation</a>. -spec getImageCount(Name, [Option]) -> integer() when - Name::string(), + Name::unicode:chardata(), Option :: {type, integer()}. getImageCount(Name, Options) when is_list(Name),is_list(Options) -> @@ -499,8 +499,8 @@ hasMask(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetoption">external documentation</a>. --spec getOption(This, Name) -> string() when - This::wxImage(), Name::string(). +-spec getOption(This, Name) -> unicode:charlist() when + This::wxImage(), Name::unicode:chardata(). getOption(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxImage), @@ -510,7 +510,7 @@ getOption(#wx_ref{type=ThisT,ref=ThisRef},Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetoptionint">external documentation</a>. -spec getOptionInt(This, Name) -> integer() when - This::wxImage(), Name::string(). + This::wxImage(), Name::unicode:chardata(). getOptionInt(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxImage), @@ -520,7 +520,7 @@ getOptionInt(#wx_ref{type=ThisT,ref=ThisRef},Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagehasoption">external documentation</a>. -spec hasOption(This, Name) -> boolean() when - This::wxImage(), Name::string(). + This::wxImage(), Name::unicode:chardata(). hasOption(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxImage), @@ -565,7 +565,7 @@ isTransparent(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options) %% @equiv loadFile(This,Name, []) -spec loadFile(This, Name) -> boolean() when - This::wxImage(), Name::string(). + This::wxImage(), Name::unicode:chardata(). loadFile(This,Name) when is_record(This, wx_ref),is_list(Name) -> @@ -573,7 +573,7 @@ loadFile(This,Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageloadfile">external documentation</a>. -spec loadFile(This, Name, [Option]) -> boolean() when - This::wxImage(), Name::string(), + This::wxImage(), Name::unicode:chardata(), Option :: {type, integer()} | {index, integer()}. loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name, Options) @@ -589,7 +589,7 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageloadfile">external documentation</a>. -spec loadFile(This, Name, Mimetype, [Option]) -> boolean() when - This::wxImage(), Name::string(), Mimetype::string(), + This::wxImage(), Name::unicode:chardata(), Mimetype::unicode:chardata(), Option :: {index, integer()}. loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Mimetype, Options) when is_list(Name),is_list(Mimetype),is_list(Options) -> @@ -612,7 +612,7 @@ ok(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageremovehandler">external documentation</a>. -spec removeHandler(Name) -> boolean() when - Name::string(). + Name::unicode:chardata(). removeHandler(Name) when is_list(Name) -> Name_UC = unicode:characters_to_binary([Name,0]), @@ -750,7 +750,7 @@ rotate90(#wx_ref{type=ThisT,ref=ThisRef}, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesavefile">external documentation</a>. -spec saveFile(This, Name) -> boolean() when - This::wxImage(), Name::string(). + This::wxImage(), Name::unicode:chardata(). saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxImage), @@ -760,9 +760,9 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesavefile">external documentation</a>. -spec saveFile(This, Name, Type) -> boolean() when - This::wxImage(), Name::string(), Type::integer(); + This::wxImage(), Name::unicode:chardata(), Type::integer(); (This, Name, Mimetype) -> boolean() when - This::wxImage(), Name::string(), Mimetype::string(). + This::wxImage(), Name::unicode:chardata(), Mimetype::unicode:chardata(). saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Type) when is_list(Name),is_integer(Type) -> ?CLASS(ThisT,wxImage), @@ -940,9 +940,9 @@ setMaskFromImage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MaskT,ref=MaskRef} %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetoption">external documentation</a>. -spec setOption(This, Name, Value) -> ok when - This::wxImage(), Name::string(), Value::integer(); + This::wxImage(), Name::unicode:chardata(), Value::integer(); (This, Name, Value) -> ok when - This::wxImage(), Name::string(), Value::string(). + This::wxImage(), Name::unicode:chardata(), Value::unicode:chardata(). setOption(#wx_ref{type=ThisT,ref=ThisRef},Name,Value) when is_list(Name),is_integer(Value) -> ?CLASS(ThisT,wxImage), @@ -985,7 +985,7 @@ setRGB(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R,G,B) <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,R:32/?UI,G:32/?UI,B:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxImage) -> ok. +-spec destroy(This::wxImage()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxImage), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxImageList.erl b/lib/wx/src/gen/wxImageList.erl index a2049ce052..e027d31b3d 100644 --- a/lib/wx/src/gen/wxImageList.erl +++ b/lib/wx/src/gen/wxImageList.erl @@ -213,7 +213,7 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=BitmapT,ref=BitmapRef <<ThisRef:32/?UI,Index:32/?UI,BitmapRef:32/?UI,MaskRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxImageList) -> ok. +-spec destroy(This::wxImageList()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxImageList), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxLayoutAlgorithm.erl b/lib/wx/src/gen/wxLayoutAlgorithm.erl index c9a7314c87..d0736e2379 100644 --- a/lib/wx/src/gen/wxLayoutAlgorithm.erl +++ b/lib/wx/src/gen/wxLayoutAlgorithm.erl @@ -108,7 +108,7 @@ layoutWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef}, <<ThisRef:32/?UI,FrameRef:32/?UI, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxLayoutAlgorithm) -> ok. +-spec destroy(This::wxLayoutAlgorithm()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxLayoutAlgorithm), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxListBox.erl b/lib/wx/src/gen/wxListBox.erl index 5cd8ba8127..d09f37811d 100644 --- a/lib/wx/src/gen/wxListBox.erl +++ b/lib/wx/src/gen/wxListBox.erl @@ -102,7 +102,7 @@ new(Parent,Id) Parent::wxWindow:wxWindow(), Id::integer(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} - | {choices, [[string()]]} + | {choices, [[unicode:chardata()]]} | {style, integer()} | {validator, wx:wx()}. new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) @@ -120,7 +120,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) %% @equiv create(This,Parent,Id,Pos,Size,Choices, []) -spec create(This, Parent, Id, Pos, Size, Choices) -> boolean() when - This::wxListBox(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]]. + This::wxListBox(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]]. create(This,Parent,Id,Pos={PosX,PosY},Size={SizeW,SizeH},Choices) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) -> @@ -128,7 +128,7 @@ create(This,Parent,Id,Pos={PosX,PosY},Size={SizeW,SizeH},Choices) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxcreate">external documentation</a>. -spec create(This, Parent, Id, Pos, Size, Choices, [Option]) -> boolean() when - This::wxListBox(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]], + This::wxListBox(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]], Option :: {style, integer()} | {validator, wx:wx()}. create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,{PosX,PosY},{SizeW,SizeH},Choices, Options) @@ -164,7 +164,7 @@ getSelections(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxinsertitems">external documentation</a>. -spec insertItems(This, Items, Pos) -> ok when - This::wxListBox(), Items::[[string()]], Pos::integer(). + This::wxListBox(), Items::[[unicode:chardata()]], Pos::integer(). insertItems(#wx_ref{type=ThisT,ref=ThisRef},Items,Pos) when is_list(Items),is_integer(Pos) -> ?CLASS(ThisT,wxListBox), @@ -184,7 +184,7 @@ isSelected(#wx_ref{type=ThisT,ref=ThisRef},N) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxset">external documentation</a>. -spec set(This, Items) -> ok when - This::wxListBox(), Items::[[string()]]. + This::wxListBox(), Items::[[unicode:chardata()]]. set(#wx_ref{type=ThisT,ref=ThisRef},Items) when is_list(Items) -> ?CLASS(ThisT,wxListBox), @@ -206,7 +206,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY}) -spec setFirstItem(This, N) -> ok when This::wxListBox(), N::integer(); (This, S) -> ok when - This::wxListBox(), S::string(). + This::wxListBox(), S::unicode:chardata(). setFirstItem(#wx_ref{type=ThisT,ref=ThisRef},N) when is_integer(N) -> ?CLASS(ThisT,wxListBox), @@ -220,7 +220,7 @@ setFirstItem(#wx_ref{type=ThisT,ref=ThisRef},S) <<ThisRef:32/?UI,(byte_size(S_UC)):32/?UI,(S_UC)/binary, 0:(((8- ((0+byte_size(S_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxListBox) -> ok. +-spec destroy(This::wxListBox()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxListBox), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxListCtrl.erl b/lib/wx/src/gen/wxListCtrl.erl index ae2db0ae2f..81a547b10f 100644 --- a/lib/wx/src/gen/wxListCtrl.erl +++ b/lib/wx/src/gen/wxListCtrl.erl @@ -263,7 +263,7 @@ ensureVisible(#wx_ref{type=ThisT,ref=ThisRef},Item) %% @equiv findItem(This,Start,Str, []) -spec findItem(This, Start, Str) -> integer() when - This::wxListCtrl(), Start::integer(), Str::string(). + This::wxListCtrl(), Start::integer(), Str::unicode:chardata(). findItem(This,Start,Str) when is_record(This, wx_ref),is_integer(Start),is_list(Str) -> @@ -271,7 +271,7 @@ findItem(This,Start,Str) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlfinditem">external documentation</a>. -spec findItem(This, Start, Str, [Option]) -> integer() when - This::wxListCtrl(), Start::integer(), Str::string(), + This::wxListCtrl(), Start::integer(), Str::unicode:chardata(), Option :: {partial, boolean()}; (This, Start, Pt, Direction) -> integer() when This::wxListCtrl(), Start::integer(), Pt::{X::integer(), Y::integer()}, Direction::integer(). @@ -352,7 +352,7 @@ getItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) -> <<ThisRef:32/?UI,InfoRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitembackgroundcolour">external documentation</a>. --spec getItemBackgroundColour(This, Item) -> wx:wx_colour() when +-spec getItemBackgroundColour(This, Item) -> wx:wx_colour4() when This::wxListCtrl(), Item::integer(). getItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item) when is_integer(Item) -> @@ -434,7 +434,7 @@ getItemState(#wx_ref{type=ThisT,ref=ThisRef},Item,StateMask) <<ThisRef:32/?UI,Item:32/?UI,StateMask:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemtext">external documentation</a>. --spec getItemText(This, Item) -> string() when +-spec getItemText(This, Item) -> unicode:charlist() when This::wxListCtrl(), Item::integer(). getItemText(#wx_ref{type=ThisT,ref=ThisRef},Item) when is_integer(Item) -> @@ -443,7 +443,7 @@ getItemText(#wx_ref{type=ThisT,ref=ThisRef},Item) <<ThisRef:32/?UI,Item:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemtextcolour">external documentation</a>. --spec getItemTextColour(This, Item) -> wx:wx_colour() when +-spec getItemTextColour(This, Item) -> wx:wx_colour4() when This::wxListCtrl(), Item::integer(). getItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item) when is_integer(Item) -> @@ -483,7 +483,7 @@ getSelectedItemCount(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgettextcolour">external documentation</a>. --spec getTextColour(This) -> wx:wx_colour() when +-spec getTextColour(This) -> wx:wx_colour4() when This::wxListCtrl(). getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxListCtrl), @@ -518,7 +518,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY}) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertcolumn">external documentation</a>. -spec insertColumn(This, Col, Heading) -> integer() when - This::wxListCtrl(), Col::integer(), Heading::string(); + This::wxListCtrl(), Col::integer(), Heading::unicode:chardata(); (This, Col, Info) -> integer() when This::wxListCtrl(), Col::integer(), Info::wxListItem:wxListItem(). @@ -534,7 +534,7 @@ insertColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=InfoT,ref=InfoRef} %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertcolumn">external documentation</a>. -spec insertColumn(This, Col, Heading, [Option]) -> integer() when - This::wxListCtrl(), Col::integer(), Heading::string(), + This::wxListCtrl(), Col::integer(), Heading::unicode:chardata(), Option :: {format, integer()} | {width, integer()}. insertColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,Heading, Options) @@ -561,7 +561,7 @@ insertItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) -> -spec insertItem(This, Index, ImageIndex) -> integer() when This::wxListCtrl(), Index::integer(), ImageIndex::integer(); (This, Index, Label) -> integer() when - This::wxListCtrl(), Index::integer(), Label::string(). + This::wxListCtrl(), Index::integer(), Label::unicode:chardata(). insertItem(#wx_ref{type=ThisT,ref=ThisRef},Index,ImageIndex) when is_integer(Index),is_integer(ImageIndex) -> ?CLASS(ThisT,wxListCtrl), @@ -576,7 +576,7 @@ insertItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertitem">external documentation</a>. -spec insertItem(This, Index, Label, ImageIndex) -> integer() when - This::wxListCtrl(), Index::integer(), Label::string(), ImageIndex::integer(). + This::wxListCtrl(), Index::integer(), Label::unicode:chardata(), ImageIndex::integer(). insertItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Label,ImageIndex) when is_integer(Index),is_list(Label),is_integer(ImageIndex) -> ?CLASS(ThisT,wxListCtrl), @@ -660,7 +660,7 @@ setItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) -> %% @equiv setItem(This,Index,Col,Label, []) -spec setItem(This, Index, Col, Label) -> integer() when - This::wxListCtrl(), Index::integer(), Col::integer(), Label::string(). + This::wxListCtrl(), Index::integer(), Col::integer(), Label::unicode:chardata(). setItem(This,Index,Col,Label) when is_record(This, wx_ref),is_integer(Index),is_integer(Col),is_list(Label) -> @@ -668,7 +668,7 @@ setItem(This,Index,Col,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitem">external documentation</a>. -spec setItem(This, Index, Col, Label, [Option]) -> integer() when - This::wxListCtrl(), Index::integer(), Col::integer(), Label::string(), + This::wxListCtrl(), Index::integer(), Col::integer(), Label::unicode:chardata(), Option :: {imageId, integer()}. setItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Col,Label, Options) when is_integer(Index),is_integer(Col),is_list(Label),is_list(Options) -> @@ -767,7 +767,7 @@ setItemState(#wx_ref{type=ThisT,ref=ThisRef},Item,State,StateMask) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemtext">external documentation</a>. -spec setItemText(This, Item, Str) -> ok when - This::wxListCtrl(), Item::integer(), Str::string(). + This::wxListCtrl(), Item::integer(), Str::unicode:chardata(). setItemText(#wx_ref{type=ThisT,ref=ThisRef},Item,Str) when is_integer(Item),is_list(Str) -> ?CLASS(ThisT,wxListCtrl), @@ -842,7 +842,7 @@ sortItems(#wx_ref{type=ThisT,ref=ThisRef}, SortCallBack) SortId = wxe_util:get_cbId(Sort), wxe_util:call(?wxListCtrl_SortItems, <<ThisRef:32/?UI,SortId:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxListCtrl) -> ok. +-spec destroy(This::wxListCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxListCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxListEvent.erl b/lib/wx/src/gen/wxListEvent.erl index f09dee4e32..9cbb816096 100644 --- a/lib/wx/src/gen/wxListEvent.erl +++ b/lib/wx/src/gen/wxListEvent.erl @@ -99,7 +99,7 @@ getPoint(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetlabel">external documentation</a>. --spec getLabel(This) -> string() when +-spec getLabel(This) -> unicode:charlist() when This::wxListEvent(). getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxListEvent), @@ -107,7 +107,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgettext">external documentation</a>. --spec getText(This) -> string() when +-spec getText(This) -> unicode:charlist() when This::wxListEvent(). getText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxListEvent), diff --git a/lib/wx/src/gen/wxListItem.erl b/lib/wx/src/gen/wxListItem.erl index f5662f8942..787d686135 100644 --- a/lib/wx/src/gen/wxListItem.erl +++ b/lib/wx/src/gen/wxListItem.erl @@ -70,7 +70,7 @@ getAlign(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetbackgroundcolour">external documentation</a>. --spec getBackgroundColour(This) -> wx:wx_colour() when +-spec getBackgroundColour(This) -> wx:wx_colour4() when This::wxListItem(). getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxListItem), @@ -126,7 +126,7 @@ getState(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgettext">external documentation</a>. --spec getText(This) -> string() when +-spec getText(This) -> unicode:charlist() when This::wxListItem(). getText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxListItem), @@ -134,7 +134,7 @@ getText(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgettextcolour">external documentation</a>. --spec getTextColour(This) -> wx:wx_colour() when +-spec getTextColour(This) -> wx:wx_colour4() when This::wxListItem(). getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxListItem), @@ -233,7 +233,7 @@ setStateMask(#wx_ref{type=ThisT,ref=ThisRef},StateMask) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsettext">external documentation</a>. -spec setText(This, Text) -> ok when - This::wxListItem(), Text::string(). + This::wxListItem(), Text::unicode:chardata(). setText(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxListItem), @@ -260,7 +260,7 @@ setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width) <<ThisRef:32/?UI,Width:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxListItem) -> ok. +-spec destroy(This::wxListItem()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxListItem), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxListItemAttr.erl b/lib/wx/src/gen/wxListItemAttr.erl index 4616e551ec..daf5ebe96a 100644 --- a/lib/wx/src/gen/wxListItemAttr.erl +++ b/lib/wx/src/gen/wxListItemAttr.erl @@ -52,7 +52,7 @@ new(ColText,ColBack,#wx_ref{type=FontT,ref=FontRef}) <<(wxe_util:colour_bin(ColText)):16/binary,(wxe_util:colour_bin(ColBack)):16/binary,FontRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgetbackgroundcolour">external documentation</a>. --spec getBackgroundColour(This) -> wx:wx_colour() when +-spec getBackgroundColour(This) -> wx:wx_colour4() when This::wxListItemAttr(). getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxListItemAttr), @@ -68,7 +68,7 @@ getFont(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgettextcolour">external documentation</a>. --spec getTextColour(This) -> wx:wx_colour() when +-spec getTextColour(This) -> wx:wx_colour4() when This::wxListItemAttr(). getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxListItemAttr), @@ -127,7 +127,7 @@ setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText) <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxListItemAttr) -> ok. +-spec destroy(This::wxListItemAttr()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxListItemAttr), wxe_util:destroy(?wxListItemAttr_destroy,Obj), diff --git a/lib/wx/src/gen/wxListbook.erl b/lib/wx/src/gen/wxListbook.erl index bacc615004..0907d554f4 100644 --- a/lib/wx/src/gen/wxListbook.erl +++ b/lib/wx/src/gen/wxListbook.erl @@ -115,7 +115,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) %% @equiv addPage(This,Page,Text, []) -spec addPage(This, Page, Text) -> boolean() when - This::wxListbook(), Page::wxWindow:wxWindow(), Text::string(). + This::wxListbook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(). addPage(This,Page,Text) when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) -> @@ -123,7 +123,7 @@ addPage(This,Page,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookaddpage">external documentation</a>. -spec addPage(This, Page, Text, [Option]) -> boolean() when - This::wxListbook(), Page::wxWindow:wxWindow(), Text::string(), + This::wxListbook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options) @@ -263,7 +263,7 @@ getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N) <<ThisRef:32/?UI,N:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetpagetext">external documentation</a>. --spec getPageText(This, N) -> string() when +-spec getPageText(This, N) -> unicode:charlist() when This::wxListbook(), N::integer(). getPageText(#wx_ref{type=ThisT,ref=ThisRef},N) when is_integer(N) -> @@ -291,7 +291,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY}) %% @equiv insertPage(This,N,Page,Text, []) -spec insertPage(This, N, Page, Text) -> boolean() when - This::wxListbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(). + This::wxListbook(), N::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(). insertPage(This,N,Page,Text) when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),is_list(Text) -> @@ -299,7 +299,7 @@ insertPage(This,N,Page,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookinsertpage">external documentation</a>. -spec insertPage(This, N, Page, Text, [Option]) -> boolean() when - This::wxListbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(), + This::wxListbook(), N::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Text, Options) @@ -343,7 +343,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetpagetext">external documentation</a>. -spec setPageText(This, N, StrText) -> boolean() when - This::wxListbook(), N::integer(), StrText::string(). + This::wxListbook(), N::integer(), StrText::unicode:chardata(). setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText) when is_integer(N),is_list(StrText) -> ?CLASS(ThisT,wxListbook), @@ -370,7 +370,7 @@ changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N) <<ThisRef:32/?UI,N:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxListbook) -> ok. +-spec destroy(This::wxListbook()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxListbook), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxLogNull.erl b/lib/wx/src/gen/wxLogNull.erl index fb53e0d151..0ac4e8f9a3 100644 --- a/lib/wx/src/gen/wxLogNull.erl +++ b/lib/wx/src/gen/wxLogNull.erl @@ -41,7 +41,7 @@ new() -> <<>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxLogNull) -> ok. +-spec destroy(This::wxLogNull()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxLogNull), wxe_util:destroy(?wxLogNull_destroy,Obj), diff --git a/lib/wx/src/gen/wxMDIChildFrame.erl b/lib/wx/src/gen/wxMDIChildFrame.erl index 6b9905b72b..861beba34f 100644 --- a/lib/wx/src/gen/wxMDIChildFrame.erl +++ b/lib/wx/src/gen/wxMDIChildFrame.erl @@ -97,7 +97,7 @@ new() -> %% @equiv new(Parent,Id,Title, []) -spec new(Parent, Id, Title) -> wxMDIChildFrame() when - Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string(). + Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::unicode:chardata(). new(Parent,Id,Title) when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) -> @@ -105,7 +105,7 @@ new(Parent,Id,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframewxmdichildframe">external documentation</a>. -spec new(Parent, Id, Title, [Option]) -> wxMDIChildFrame() when - Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string(), + Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -131,7 +131,7 @@ activate(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @equiv create(This,Parent,Id,Title, []) -spec create(This, Parent, Id, Title) -> boolean() when - This::wxMDIChildFrame(), Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string(). + This::wxMDIChildFrame(), Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::unicode:chardata(). create(This,Parent,Id,Title) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) -> @@ -139,7 +139,7 @@ create(This,Parent,Id,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframecreate">external documentation</a>. -spec create(This, Parent, Id, Title, [Option]) -> boolean() when - This::wxMDIChildFrame(), Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::string(), + This::wxMDIChildFrame(), Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -186,7 +186,7 @@ restore(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMDIChildFrame) -> ok. +-spec destroy(This::wxMDIChildFrame()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMDIChildFrame), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMDIClientWindow.erl b/lib/wx/src/gen/wxMDIClientWindow.erl index 7399b8be26..344dcdbbaf 100644 --- a/lib/wx/src/gen/wxMDIClientWindow.erl +++ b/lib/wx/src/gen/wxMDIClientWindow.erl @@ -125,7 +125,7 @@ createClient(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef} <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMDIClientWindow) -> ok. +-spec destroy(This::wxMDIClientWindow()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMDIClientWindow), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMDIParentFrame.erl b/lib/wx/src/gen/wxMDIParentFrame.erl index 545d52c3cd..1a7e7387b9 100644 --- a/lib/wx/src/gen/wxMDIParentFrame.erl +++ b/lib/wx/src/gen/wxMDIParentFrame.erl @@ -99,7 +99,7 @@ new() -> %% @equiv new(Parent,Id,Title, []) -spec new(Parent, Id, Title) -> wxMDIParentFrame() when - Parent::wxWindow:wxWindow(), Id::integer(), Title::string(). + Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(). new(Parent,Id,Title) when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) -> @@ -107,7 +107,7 @@ new(Parent,Id,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframewxmdiparentframe">external documentation</a>. -spec new(Parent, Id, Title, [Option]) -> wxMDIParentFrame() when - Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), + Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -157,7 +157,7 @@ cascade(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @equiv create(This,Parent,Id,Title, []) -spec create(This, Parent, Id, Title) -> boolean() when - This::wxMDIParentFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(). + This::wxMDIParentFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(). create(This,Parent,Id,Title) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) -> @@ -165,7 +165,7 @@ create(This,Parent,Id,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframecreate">external documentation</a>. -spec create(This, Parent, Id, Title, [Option]) -> boolean() when - This::wxMDIParentFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), + This::wxMDIParentFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -221,7 +221,7 @@ tile(#wx_ref{type=ThisT,ref=ThisRef}, Options) <<ThisRef:32/?UI, 0:32,BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMDIParentFrame) -> ok. +-spec destroy(This::wxMDIParentFrame()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMDIParentFrame), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMask.erl b/lib/wx/src/gen/wxMask.erl index 488cddc260..5bcd518556 100644 --- a/lib/wx/src/gen/wxMask.erl +++ b/lib/wx/src/gen/wxMask.erl @@ -92,7 +92,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef},Colou <<ThisRef:32/?UI,BitmapRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMask) -> ok. +-spec destroy(This::wxMask()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMask), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMemoryDC.erl b/lib/wx/src/gen/wxMemoryDC.erl index a6d55e53d2..cac20094a0 100644 --- a/lib/wx/src/gen/wxMemoryDC.erl +++ b/lib/wx/src/gen/wxMemoryDC.erl @@ -96,7 +96,7 @@ selectObjectAsSource(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRe <<ThisRef:32/?UI,BmpRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMemoryDC) -> ok. +-spec destroy(This::wxMemoryDC()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMemoryDC), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMenu.erl b/lib/wx/src/gen/wxMenu.erl index dd674b117d..994855f805 100644 --- a/lib/wx/src/gen/wxMenu.erl +++ b/lib/wx/src/gen/wxMenu.erl @@ -65,7 +65,7 @@ new(Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuwxmenu">external documentation</a>. -spec new(Title, [Option]) -> wxMenu() when - Title::string(), + Title::unicode:chardata(), Option :: {style, integer()}. new(Title, Options) when is_list(Title),is_list(Options) -> @@ -87,7 +87,7 @@ append(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) -> %% @equiv append(This,Itemid,Text, []) -spec append(This, Itemid, Text) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(). + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(). append(This,Itemid,Text) when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) -> @@ -95,10 +95,10 @@ append(This,Itemid,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappend">external documentation</a>. -spec append(This, Itemid, Text, Submenu) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu(); + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), Submenu::wxMenu(); (This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(), - Option :: {help, string()} + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), + Option :: {help, unicode:chardata()} | {kind, wx:wx_enum()}. append(This,Itemid,Text,Submenu) @@ -117,10 +117,10 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappend">external documentation</a>. -spec append(This, Itemid, Text, Help, IsCheckable) -> ok when - This::wxMenu(), Itemid::integer(), Text::string(), Help::string(), IsCheckable::boolean(); + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), Help::unicode:chardata(), IsCheckable::boolean(); (This, Itemid, Text, Submenu, [Option]) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu(), - Option :: {help, string()}. + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), Submenu::wxMenu(), + Option :: {help, unicode:chardata()}. append(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text,Help,IsCheckable) when is_integer(Itemid),is_list(Text),is_list(Help),is_boolean(IsCheckable) -> ?CLASS(ThisT,wxMenu), @@ -141,7 +141,7 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text,#wx_ref{type=SubmenuT,ref=Sub %% @equiv appendCheckItem(This,Itemid,Text, []) -spec appendCheckItem(This, Itemid, Text) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(). + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(). appendCheckItem(This,Itemid,Text) when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) -> @@ -149,8 +149,8 @@ appendCheckItem(This,Itemid,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappendcheckitem">external documentation</a>. -spec appendCheckItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(), - Option :: {help, string()}. + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), + Option :: {help, unicode:chardata()}. appendCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options) when is_integer(Itemid),is_list(Text),is_list(Options) -> ?CLASS(ThisT,wxMenu), @@ -163,7 +163,7 @@ appendCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options) %% @equiv appendRadioItem(This,Itemid,Text, []) -spec appendRadioItem(This, Itemid, Text) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(). + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(). appendRadioItem(This,Itemid,Text) when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) -> @@ -171,8 +171,8 @@ appendRadioItem(This,Itemid,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappendradioitem">external documentation</a>. -spec appendRadioItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(), - Option :: {help, string()}. + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), + Option :: {help, unicode:chardata()}. appendRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options) when is_integer(Itemid),is_list(Text),is_list(Options) -> ?CLASS(ThisT,wxMenu), @@ -253,7 +253,7 @@ enable(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Enable) -spec findItem(This, Itemid) -> wxMenuItem:wxMenuItem() when This::wxMenu(), Itemid::integer(); (This, Item) -> integer() when - This::wxMenu(), Item::string(). + This::wxMenu(), Item::unicode:chardata(). findItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid) when is_integer(Itemid) -> ?CLASS(ThisT,wxMenu), @@ -276,7 +276,7 @@ findItemByPosition(#wx_ref{type=ThisT,ref=ThisRef},Position) <<ThisRef:32/?UI,Position:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugethelpstring">external documentation</a>. --spec getHelpString(This, Itemid) -> string() when +-spec getHelpString(This, Itemid) -> unicode:charlist() when This::wxMenu(), Itemid::integer(). getHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid) when is_integer(Itemid) -> @@ -285,7 +285,7 @@ getHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid) <<ThisRef:32/?UI,Itemid:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugetlabel">external documentation</a>. --spec getLabel(This, Itemid) -> string() when +-spec getLabel(This, Itemid) -> unicode:charlist() when This::wxMenu(), Itemid::integer(). getLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid) when is_integer(Itemid) -> @@ -310,7 +310,7 @@ getMenuItems(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugettitle">external documentation</a>. --spec getTitle(This) -> string() when +-spec getTitle(This) -> unicode:charlist() when This::wxMenu(). getTitle(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxMenu), @@ -337,8 +337,8 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ItemT,ref=ItemRef}) %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX -spec insert(This, Pos, Itemid, [Option]) -> wxMenuItem:wxMenuItem() when This::wxMenu(), Pos::integer(), Itemid::integer(), - Option :: {text, string()} - | {help, string()} + Option :: {text, unicode:chardata()} + | {help, unicode:chardata()} | {kind, wx:wx_enum()}. insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid, Options) when is_integer(Pos),is_integer(Itemid),is_list(Options) -> @@ -353,7 +353,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid, Options) %% @equiv insert(This,Pos,Itemid,Text,Submenu, []) -spec insert(This, Pos, Itemid, Text, Submenu) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), Submenu::wxMenu(). + This::wxMenu(), Pos::integer(), Itemid::integer(), Text::unicode:chardata(), Submenu::wxMenu(). insert(This,Pos,Itemid,Text,Submenu) when is_record(This, wx_ref),is_integer(Pos),is_integer(Itemid),is_list(Text),is_record(Submenu, wx_ref) -> @@ -361,10 +361,10 @@ insert(This,Pos,Itemid,Text,Submenu) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsert">external documentation</a>. -spec insert(This, Pos, Itemid, Text, Help, IsCheckable) -> ok when - This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), Help::string(), IsCheckable::boolean(); + This::wxMenu(), Pos::integer(), Itemid::integer(), Text::unicode:chardata(), Help::unicode:chardata(), IsCheckable::boolean(); (This, Pos, Itemid, Text, Submenu, [Option]) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), Submenu::wxMenu(), - Option :: {help, string()}. + This::wxMenu(), Pos::integer(), Itemid::integer(), Text::unicode:chardata(), Submenu::wxMenu(), + Option :: {help, unicode:chardata()}. insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text,Help,IsCheckable) when is_integer(Pos),is_integer(Itemid),is_list(Text),is_list(Help),is_boolean(IsCheckable) -> ?CLASS(ThisT,wxMenu), @@ -385,7 +385,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text,#wx_ref{type=SubmenuT,ref %% @equiv insertCheckItem(This,Pos,Itemid,Text, []) -spec insertCheckItem(This, Pos, Itemid, Text) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(). + This::wxMenu(), Pos::integer(), Itemid::integer(), Text::unicode:chardata(). insertCheckItem(This,Pos,Itemid,Text) when is_record(This, wx_ref),is_integer(Pos),is_integer(Itemid),is_list(Text) -> @@ -393,8 +393,8 @@ insertCheckItem(This,Pos,Itemid,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsertcheckitem">external documentation</a>. -spec insertCheckItem(This, Pos, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), - Option :: {help, string()}. + This::wxMenu(), Pos::integer(), Itemid::integer(), Text::unicode:chardata(), + Option :: {help, unicode:chardata()}. insertCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text, Options) when is_integer(Pos),is_integer(Itemid),is_list(Text),is_list(Options) -> ?CLASS(ThisT,wxMenu), @@ -407,7 +407,7 @@ insertCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text, Options) %% @equiv insertRadioItem(This,Pos,Itemid,Text, []) -spec insertRadioItem(This, Pos, Itemid, Text) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(). + This::wxMenu(), Pos::integer(), Itemid::integer(), Text::unicode:chardata(). insertRadioItem(This,Pos,Itemid,Text) when is_record(This, wx_ref),is_integer(Pos),is_integer(Itemid),is_list(Text) -> @@ -415,8 +415,8 @@ insertRadioItem(This,Pos,Itemid,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsertradioitem">external documentation</a>. -spec insertRadioItem(This, Pos, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Pos::integer(), Itemid::integer(), Text::string(), - Option :: {help, string()}. + This::wxMenu(), Pos::integer(), Itemid::integer(), Text::unicode:chardata(), + Option :: {help, unicode:chardata()}. insertRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text, Options) when is_integer(Pos),is_integer(Itemid),is_list(Text),is_list(Options) -> ?CLASS(ThisT,wxMenu), @@ -473,8 +473,8 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) -> %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX -spec prepend(This, Itemid, [Option]) -> wxMenuItem:wxMenuItem() when This::wxMenu(), Itemid::integer(), - Option :: {text, string()} - | {help, string()} + Option :: {text, unicode:chardata()} + | {help, unicode:chardata()} | {kind, wx:wx_enum()}. prepend(#wx_ref{type=ThisT,ref=ThisRef},Itemid, Options) when is_integer(Itemid),is_list(Options) -> @@ -489,7 +489,7 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},Itemid, Options) %% @equiv prepend(This,Itemid,Text,Submenu, []) -spec prepend(This, Itemid, Text, Submenu) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu(). + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), Submenu::wxMenu(). prepend(This,Itemid,Text,Submenu) when is_record(This, wx_ref),is_integer(Itemid),is_list(Text),is_record(Submenu, wx_ref) -> @@ -497,10 +497,10 @@ prepend(This,Itemid,Text,Submenu) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprepend">external documentation</a>. -spec prepend(This, Itemid, Text, Help, IsCheckable) -> ok when - This::wxMenu(), Itemid::integer(), Text::string(), Help::string(), IsCheckable::boolean(); + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), Help::unicode:chardata(), IsCheckable::boolean(); (This, Itemid, Text, Submenu, [Option]) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(), Submenu::wxMenu(), - Option :: {help, string()}. + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), Submenu::wxMenu(), + Option :: {help, unicode:chardata()}. prepend(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text,Help,IsCheckable) when is_integer(Itemid),is_list(Text),is_list(Help),is_boolean(IsCheckable) -> ?CLASS(ThisT,wxMenu), @@ -521,7 +521,7 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text,#wx_ref{type=SubmenuT,ref=Su %% @equiv prependCheckItem(This,Itemid,Text, []) -spec prependCheckItem(This, Itemid, Text) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(). + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(). prependCheckItem(This,Itemid,Text) when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) -> @@ -529,8 +529,8 @@ prependCheckItem(This,Itemid,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprependcheckitem">external documentation</a>. -spec prependCheckItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(), - Option :: {help, string()}. + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), + Option :: {help, unicode:chardata()}. prependCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options) when is_integer(Itemid),is_list(Text),is_list(Options) -> ?CLASS(ThisT,wxMenu), @@ -543,7 +543,7 @@ prependCheckItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options) %% @equiv prependRadioItem(This,Itemid,Text, []) -spec prependRadioItem(This, Itemid, Text) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(). + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(). prependRadioItem(This,Itemid,Text) when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) -> @@ -551,8 +551,8 @@ prependRadioItem(This,Itemid,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprependradioitem">external documentation</a>. -spec prependRadioItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when - This::wxMenu(), Itemid::integer(), Text::string(), - Option :: {help, string()}. + This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), + Option :: {help, unicode:chardata()}. prependRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options) when is_integer(Itemid),is_list(Text),is_list(Options) -> ?CLASS(ThisT,wxMenu), @@ -589,7 +589,7 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenusethelpstring">external documentation</a>. -spec setHelpString(This, Itemid, HelpString) -> ok when - This::wxMenu(), Itemid::integer(), HelpString::string(). + This::wxMenu(), Itemid::integer(), HelpString::unicode:chardata(). setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString) when is_integer(Itemid),is_list(HelpString) -> ?CLASS(ThisT,wxMenu), @@ -599,7 +599,7 @@ setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenusetlabel">external documentation</a>. -spec setLabel(This, Itemid, Label) -> ok when - This::wxMenu(), Itemid::integer(), Label::string(). + This::wxMenu(), Itemid::integer(), Label::unicode:chardata(). setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label) when is_integer(Itemid),is_list(Label) -> ?CLASS(ThisT,wxMenu), @@ -609,7 +609,7 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenusettitle">external documentation</a>. -spec setTitle(This, Title) -> ok when - This::wxMenu(), Title::string(). + This::wxMenu(), Title::unicode:chardata(). setTitle(#wx_ref{type=ThisT,ref=ThisRef},Title) when is_list(Title) -> ?CLASS(ThisT,wxMenu), @@ -618,7 +618,7 @@ setTitle(#wx_ref{type=ThisT,ref=ThisRef},Title) <<ThisRef:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((0+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMenu) -> ok. +-spec destroy(This::wxMenu()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMenu), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMenuBar.erl b/lib/wx/src/gen/wxMenuBar.erl index 3538e58791..b0253292bd 100644 --- a/lib/wx/src/gen/wxMenuBar.erl +++ b/lib/wx/src/gen/wxMenuBar.erl @@ -95,7 +95,7 @@ new(Style) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarappend">external documentation</a>. -spec append(This, Menu, Title) -> boolean() when - This::wxMenuBar(), Menu::wxMenu:wxMenu(), Title::string(). + This::wxMenuBar(), Menu::wxMenu:wxMenu(), Title::unicode:chardata(). append(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef},Title) when is_list(Title) -> ?CLASS(ThisT,wxMenuBar), @@ -154,7 +154,7 @@ enableTop(#wx_ref{type=ThisT,ref=ThisRef},Pos,Flag) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarfindmenu">external documentation</a>. -spec findMenu(This, Title) -> integer() when - This::wxMenuBar(), Title::string(). + This::wxMenuBar(), Title::unicode:chardata(). findMenu(#wx_ref{type=ThisT,ref=ThisRef},Title) when is_list(Title) -> ?CLASS(ThisT,wxMenuBar), @@ -164,7 +164,7 @@ findMenu(#wx_ref{type=ThisT,ref=ThisRef},Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarfindmenuitem">external documentation</a>. -spec findMenuItem(This, MenuString, ItemString) -> integer() when - This::wxMenuBar(), MenuString::string(), ItemString::string(). + This::wxMenuBar(), MenuString::unicode:chardata(), ItemString::unicode:chardata(). findMenuItem(#wx_ref{type=ThisT,ref=ThisRef},MenuString,ItemString) when is_list(MenuString),is_list(ItemString) -> ?CLASS(ThisT,wxMenuBar), @@ -183,7 +183,7 @@ findItem(#wx_ref{type=ThisT,ref=ThisRef},Id) <<ThisRef:32/?UI,Id:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargethelpstring">external documentation</a>. --spec getHelpString(This, Itemid) -> string() when +-spec getHelpString(This, Itemid) -> unicode:charlist() when This::wxMenuBar(), Itemid::integer(). getHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid) when is_integer(Itemid) -> @@ -192,7 +192,7 @@ getHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid) <<ThisRef:32/?UI,Itemid:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetlabel">external documentation</a>. --spec getLabel(This) -> string() when +-spec getLabel(This) -> unicode:charlist() when This::wxMenuBar(). getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxMenuBar), @@ -200,7 +200,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetlabel">external documentation</a>. --spec getLabel(This, Itemid) -> string() when +-spec getLabel(This, Itemid) -> unicode:charlist() when This::wxMenuBar(), Itemid::integer(). getLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid) when is_integer(Itemid) -> @@ -209,7 +209,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid) <<ThisRef:32/?UI,Itemid:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetlabeltop">external documentation</a>. --spec getLabelTop(This, Pos) -> string() when +-spec getLabelTop(This, Pos) -> unicode:charlist() when This::wxMenuBar(), Pos::integer(). getLabelTop(#wx_ref{type=ThisT,ref=ThisRef},Pos) when is_integer(Pos) -> @@ -236,7 +236,7 @@ getMenuCount(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarinsert">external documentation</a>. -spec insert(This, Pos, Menu, Title) -> boolean() when - This::wxMenuBar(), Pos::integer(), Menu::wxMenu:wxMenu(), Title::string(). + This::wxMenuBar(), Pos::integer(), Menu::wxMenu:wxMenu(), Title::unicode:chardata(). insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Title) when is_integer(Pos),is_list(Title) -> ?CLASS(ThisT,wxMenuBar), @@ -282,7 +282,7 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},Pos) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarreplace">external documentation</a>. -spec replace(This, Pos, Menu, Title) -> wxMenu:wxMenu() when - This::wxMenuBar(), Pos::integer(), Menu::wxMenu:wxMenu(), Title::string(). + This::wxMenuBar(), Pos::integer(), Menu::wxMenu:wxMenu(), Title::unicode:chardata(). replace(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Title) when is_integer(Pos),is_list(Title) -> ?CLASS(ThisT,wxMenuBar), @@ -293,7 +293,7 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Titl %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsethelpstring">external documentation</a>. -spec setHelpString(This, Itemid, HelpString) -> ok when - This::wxMenuBar(), Itemid::integer(), HelpString::string(). + This::wxMenuBar(), Itemid::integer(), HelpString::unicode:chardata(). setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString) when is_integer(Itemid),is_list(HelpString) -> ?CLASS(ThisT,wxMenuBar), @@ -303,7 +303,7 @@ setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsetlabel">external documentation</a>. -spec setLabel(This, S) -> ok when - This::wxMenuBar(), S::string(). + This::wxMenuBar(), S::unicode:chardata(). setLabel(#wx_ref{type=ThisT,ref=ThisRef},S) when is_list(S) -> ?CLASS(ThisT,wxMenuBar), @@ -313,7 +313,7 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},S) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsetlabel">external documentation</a>. -spec setLabel(This, Itemid, Label) -> ok when - This::wxMenuBar(), Itemid::integer(), Label::string(). + This::wxMenuBar(), Itemid::integer(), Label::unicode:chardata(). setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label) when is_integer(Itemid),is_list(Label) -> ?CLASS(ThisT,wxMenuBar), @@ -323,7 +323,7 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsetlabeltop">external documentation</a>. -spec setLabelTop(This, Pos, Label) -> ok when - This::wxMenuBar(), Pos::integer(), Label::string(). + This::wxMenuBar(), Pos::integer(), Label::unicode:chardata(). setLabelTop(#wx_ref{type=ThisT,ref=ThisRef},Pos,Label) when is_integer(Pos),is_list(Label) -> ?CLASS(ThisT,wxMenuBar), @@ -332,7 +332,7 @@ setLabelTop(#wx_ref{type=ThisT,ref=ThisRef},Pos,Label) <<ThisRef:32/?UI,Pos:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMenuBar) -> ok. +-spec destroy(This::wxMenuBar()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMenuBar), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMenuItem.erl b/lib/wx/src/gen/wxMenuItem.erl index 76ce8408ed..7ad71a2858 100644 --- a/lib/wx/src/gen/wxMenuItem.erl +++ b/lib/wx/src/gen/wxMenuItem.erl @@ -48,8 +48,8 @@ new() -> -spec new([Option]) -> wxMenuItem() when Option :: {parentMenu, wxMenu:wxMenu()} | {id, integer()} - | {text, string()} - | {help, string()} + | {text, unicode:chardata()} + | {help, unicode:chardata()} | {kind, wx:wx_enum()} | {subMenu, wxMenu:wxMenu()}. new(Options) @@ -116,7 +116,7 @@ getBitmap(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgethelp">external documentation</a>. --spec getHelp(This) -> string() when +-spec getHelp(This) -> unicode:charlist() when This::wxMenuItem(). getHelp(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxMenuItem), @@ -141,7 +141,7 @@ getKind(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetlabel">external documentation</a>. --spec getLabel(This) -> string() when +-spec getLabel(This) -> unicode:charlist() when This::wxMenuItem(). getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxMenuItem), @@ -149,8 +149,8 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetlabelfromtext">external documentation</a>. --spec getLabelFromText(Text) -> string() when - Text::string(). +-spec getLabelFromText(Text) -> unicode:charlist() when + Text::unicode:chardata(). getLabelFromText(Text) when is_list(Text) -> Text_UC = unicode:characters_to_binary([Text,0]), @@ -166,7 +166,7 @@ getMenu(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgettext">external documentation</a>. --spec getText(This) -> string() when +-spec getText(This) -> unicode:charlist() when This::wxMenuItem(). getText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxMenuItem), @@ -232,7 +232,7 @@ setBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) - %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsethelp">external documentation</a>. -spec setHelp(This, Str) -> ok when - This::wxMenuItem(), Str::string(). + This::wxMenuItem(), Str::unicode:chardata(). setHelp(#wx_ref{type=ThisT,ref=ThisRef},Str) when is_list(Str) -> ?CLASS(ThisT,wxMenuItem), @@ -260,7 +260,7 @@ setSubMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsettext">external documentation</a>. -spec setText(This, Str) -> ok when - This::wxMenuItem(), Str::string(). + This::wxMenuItem(), Str::unicode:chardata(). setText(#wx_ref{type=ThisT,ref=ThisRef},Str) when is_list(Str) -> ?CLASS(ThisT,wxMenuItem), @@ -269,7 +269,7 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Str) <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMenuItem) -> ok. +-spec destroy(This::wxMenuItem()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMenuItem), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMessageDialog.erl b/lib/wx/src/gen/wxMessageDialog.erl index 0748b22530..83c3e67d01 100644 --- a/lib/wx/src/gen/wxMessageDialog.erl +++ b/lib/wx/src/gen/wxMessageDialog.erl @@ -88,7 +88,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxMessageDialog() :: wx:wx_object(). %% @equiv new(Parent,Message, []) -spec new(Parent, Message) -> wxMessageDialog() when - Parent::wxWindow:wxWindow(), Message::string(). + Parent::wxWindow:wxWindow(), Message::unicode:chardata(). new(Parent,Message) when is_record(Parent, wx_ref),is_list(Message) -> @@ -96,8 +96,8 @@ new(Parent,Message) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmessagedialog.html#wxmessagedialogwxmessagedialog">external documentation</a>. -spec new(Parent, Message, [Option]) -> wxMessageDialog() when - Parent::wxWindow:wxWindow(), Message::string(), - Option :: {caption, string()} + Parent::wxWindow:wxWindow(), Message::unicode:chardata(), + Option :: {caption, unicode:chardata()} | {style, integer()} | {pos, {X::integer(), Y::integer()}}. new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options) @@ -113,7 +113,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options) <<ParentRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMessageDialog) -> ok. +-spec destroy(This::wxMessageDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMessageDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMiniFrame.erl b/lib/wx/src/gen/wxMiniFrame.erl index 0ddec78c0e..3521c6458c 100644 --- a/lib/wx/src/gen/wxMiniFrame.erl +++ b/lib/wx/src/gen/wxMiniFrame.erl @@ -97,7 +97,7 @@ new() -> %% @equiv new(Parent,Id,Title, []) -spec new(Parent, Id, Title) -> wxMiniFrame() when - Parent::wxWindow:wxWindow(), Id::integer(), Title::string(). + Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(). new(Parent,Id,Title) when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) -> @@ -105,7 +105,7 @@ new(Parent,Id,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxminiframe.html#wxminiframewxminiframe">external documentation</a>. -spec new(Parent, Id, Title, [Option]) -> wxMiniFrame() when - Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), + Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -123,7 +123,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options) %% @equiv create(This,Parent,Id,Title, []) -spec create(This, Parent, Id, Title) -> boolean() when - This::wxMiniFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(). + This::wxMiniFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(). create(This,Parent,Id,Title) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) -> @@ -131,7 +131,7 @@ create(This,Parent,Id,Title) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxminiframe.html#wxminiframecreate">external documentation</a>. -spec create(This, Parent, Id, Title, [Option]) -> boolean() when - This::wxMiniFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), + This::wxMiniFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -149,7 +149,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ti <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((0+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMiniFrame) -> ok. +-spec destroy(This::wxMiniFrame()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMiniFrame), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMirrorDC.erl b/lib/wx/src/gen/wxMirrorDC.erl index 6bc1e839e2..1fdb90e4eb 100644 --- a/lib/wx/src/gen/wxMirrorDC.erl +++ b/lib/wx/src/gen/wxMirrorDC.erl @@ -68,7 +68,7 @@ new(#wx_ref{type=DcT,ref=DcRef},Mirror) <<DcRef:32/?UI,(wxe_util:from_bool(Mirror)):32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMirrorDC) -> ok. +-spec destroy(This::wxMirrorDC()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMirrorDC), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxMultiChoiceDialog.erl b/lib/wx/src/gen/wxMultiChoiceDialog.erl index 7c19a1ca42..04cbb832ea 100644 --- a/lib/wx/src/gen/wxMultiChoiceDialog.erl +++ b/lib/wx/src/gen/wxMultiChoiceDialog.erl @@ -94,7 +94,7 @@ new() -> %% @equiv new(Parent,Message,Caption,Choices, []) -spec new(Parent, Message, Caption, Choices) -> wxMultiChoiceDialog() when - Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]]. + Parent::wxWindow:wxWindow(), Message::unicode:chardata(), Caption::unicode:chardata(), Choices::[[unicode:chardata()]]. new(Parent,Message,Caption,Choices) when is_record(Parent, wx_ref),is_list(Message),is_list(Caption),is_list(Choices) -> @@ -102,7 +102,7 @@ new(Parent,Message,Caption,Choices) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmultichoicedialog.html#wxmultichoicedialogwxmultichoicedialog">external documentation</a>. -spec new(Parent, Message, Caption, Choices, [Option]) -> wxMultiChoiceDialog() when - Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]], + Parent::wxWindow:wxWindow(), Message::unicode:chardata(), Caption::unicode:chardata(), Choices::[[unicode:chardata()]], Option :: {style, integer()} | {pos, {X::integer(), Y::integer()}}. new(#wx_ref{type=ParentT,ref=ParentRef},Message,Caption,Choices, Options) @@ -138,7 +138,7 @@ setSelections(#wx_ref{type=ThisT,ref=ThisRef},Selections) (<< <<C:32/?I>> || C <- Selections>>)/binary, 0:(((0+length(Selections)) rem 2)*32)>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxMultiChoiceDialog) -> ok. +-spec destroy(This::wxMultiChoiceDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxMultiChoiceDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxNotebook.erl b/lib/wx/src/gen/wxNotebook.erl index da0b9c13bf..04ab62b047 100644 --- a/lib/wx/src/gen/wxNotebook.erl +++ b/lib/wx/src/gen/wxNotebook.erl @@ -115,7 +115,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Winid, Options) %% @equiv addPage(This,Page,Text, []) -spec addPage(This, Page, Text) -> boolean() when - This::wxNotebook(), Page::wxWindow:wxWindow(), Text::string(). + This::wxNotebook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(). addPage(This,Page,Text) when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) -> @@ -123,7 +123,7 @@ addPage(This,Page,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookaddpage">external documentation</a>. -spec addPage(This, Page, Text, [Option]) -> boolean() when - This::wxNotebook(), Page::wxWindow:wxWindow(), Text::string(), + This::wxNotebook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options) @@ -263,7 +263,7 @@ getPageImage(#wx_ref{type=ThisT,ref=ThisRef},NPage) <<ThisRef:32/?UI,NPage:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetpagetext">external documentation</a>. --spec getPageText(This, NPage) -> string() when +-spec getPageText(This, NPage) -> unicode:charlist() when This::wxNotebook(), NPage::integer(). getPageText(#wx_ref{type=ThisT,ref=ThisRef},NPage) when is_integer(NPage) -> @@ -288,7 +288,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetthemebackgroundcolour">external documentation</a>. --spec getThemeBackgroundColour(This) -> wx:wx_colour() when +-spec getThemeBackgroundColour(This) -> wx:wx_colour4() when This::wxNotebook(). getThemeBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxNotebook), @@ -307,7 +307,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY}) %% @equiv insertPage(This,Position,Win,StrText, []) -spec insertPage(This, Position, Win, StrText) -> boolean() when - This::wxNotebook(), Position::integer(), Win::wxWindow:wxWindow(), StrText::string(). + This::wxNotebook(), Position::integer(), Win::wxWindow:wxWindow(), StrText::unicode:chardata(). insertPage(This,Position,Win,StrText) when is_record(This, wx_ref),is_integer(Position),is_record(Win, wx_ref),is_list(StrText) -> @@ -315,7 +315,7 @@ insertPage(This,Position,Win,StrText) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookinsertpage">external documentation</a>. -spec insertPage(This, Position, Win, StrText, [Option]) -> boolean() when - This::wxNotebook(), Position::integer(), Win::wxWindow:wxWindow(), StrText::string(), + This::wxNotebook(), Position::integer(), Win::wxWindow:wxWindow(), StrText::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. insertPage(#wx_ref{type=ThisT,ref=ThisRef},Position,#wx_ref{type=WinT,ref=WinRef},StrText, Options) @@ -368,7 +368,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},NPage,NImage) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetpagetext">external documentation</a>. -spec setPageText(This, NPage, StrText) -> boolean() when - This::wxNotebook(), NPage::integer(), StrText::string(). + This::wxNotebook(), NPage::integer(), StrText::unicode:chardata(). setPageText(#wx_ref{type=ThisT,ref=ThisRef},NPage,StrText) when is_integer(NPage),is_list(StrText) -> ?CLASS(ThisT,wxNotebook), @@ -395,7 +395,7 @@ changeSelection(#wx_ref{type=ThisT,ref=ThisRef},NPage) <<ThisRef:32/?UI,NPage:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxNotebook) -> ok. +-spec destroy(This::wxNotebook()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxNotebook), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPageSetupDialog.erl b/lib/wx/src/gen/wxPageSetupDialog.erl index 227e72b679..653ba5f015 100644 --- a/lib/wx/src/gen/wxPageSetupDialog.erl +++ b/lib/wx/src/gen/wxPageSetupDialog.erl @@ -72,7 +72,7 @@ showModal(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPageSetupDialog) -> ok. +-spec destroy(This::wxPageSetupDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPageSetupDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPageSetupDialogData.erl b/lib/wx/src/gen/wxPageSetupDialogData.erl index 4670526067..605e26c5d5 100644 --- a/lib/wx/src/gen/wxPageSetupDialogData.erl +++ b/lib/wx/src/gen/wxPageSetupDialogData.erl @@ -314,7 +314,7 @@ setPrintData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PrintDataT,ref=PrintDa <<ThisRef:32/?UI,PrintDataRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPageSetupDialogData) -> ok. +-spec destroy(This::wxPageSetupDialogData()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPageSetupDialogData), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPaintDC.erl b/lib/wx/src/gen/wxPaintDC.erl index 57ea987c8f..9e81bc31af 100644 --- a/lib/wx/src/gen/wxPaintDC.erl +++ b/lib/wx/src/gen/wxPaintDC.erl @@ -75,7 +75,7 @@ new(#wx_ref{type=WinT,ref=WinRef}) -> <<WinRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPaintDC) -> ok. +-spec destroy(This::wxPaintDC()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPaintDC), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPalette.erl b/lib/wx/src/gen/wxPalette.erl index a3005bff80..991f706acb 100644 --- a/lib/wx/src/gen/wxPalette.erl +++ b/lib/wx/src/gen/wxPalette.erl @@ -100,7 +100,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPalette) -> ok. +-spec destroy(This::wxPalette()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPalette), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPanel.erl b/lib/wx/src/gen/wxPanel.erl index fb1781a775..88c1b119a8 100644 --- a/lib/wx/src/gen/wxPanel.erl +++ b/lib/wx/src/gen/wxPanel.erl @@ -138,7 +138,7 @@ initDialog(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPanel) -> ok. +-spec destroy(This::wxPanel()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPanel), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPasswordEntryDialog.erl b/lib/wx/src/gen/wxPasswordEntryDialog.erl index 7508bf6506..d5a9f6150a 100644 --- a/lib/wx/src/gen/wxPasswordEntryDialog.erl +++ b/lib/wx/src/gen/wxPasswordEntryDialog.erl @@ -91,7 +91,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxPasswordEntryDialog() :: wx:wx_object(). %% @equiv new(Parent,Message, []) -spec new(Parent, Message) -> wxPasswordEntryDialog() when - Parent::wxWindow:wxWindow(), Message::string(). + Parent::wxWindow:wxWindow(), Message::unicode:chardata(). new(Parent,Message) when is_record(Parent, wx_ref),is_list(Message) -> @@ -99,9 +99,9 @@ new(Parent,Message) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpasswordentrydialog.html#wxpasswordentrydialogwxpasswordentrydialog">external documentation</a>. -spec new(Parent, Message, [Option]) -> wxPasswordEntryDialog() when - Parent::wxWindow:wxWindow(), Message::string(), - Option :: {caption, string()} - | {value, string()} + Parent::wxWindow:wxWindow(), Message::unicode:chardata(), + Option :: {caption, unicode:chardata()} + | {value, unicode:chardata()} | {style, integer()} | {pos, {X::integer(), Y::integer()}}. new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options) @@ -118,7 +118,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options) <<ParentRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPasswordEntryDialog) -> ok. +-spec destroy(This::wxPasswordEntryDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPasswordEntryDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPen.erl b/lib/wx/src/gen/wxPen.erl index 629f3edfd7..8b8aafddba 100644 --- a/lib/wx/src/gen/wxPen.erl +++ b/lib/wx/src/gen/wxPen.erl @@ -73,7 +73,7 @@ getCap(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetcolour">external documentation</a>. --spec getColour(This) -> wx:wx_colour() when +-spec getColour(This) -> wx:wx_colour4() when This::wxPen(). getColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxPen), @@ -167,7 +167,7 @@ setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width) <<ThisRef:32/?UI,Width:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPen) -> ok. +-spec destroy(This::wxPen()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPen), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPostScriptDC.erl b/lib/wx/src/gen/wxPostScriptDC.erl index 277241184a..2eb25b6a8e 100644 --- a/lib/wx/src/gen/wxPostScriptDC.erl +++ b/lib/wx/src/gen/wxPostScriptDC.erl @@ -87,7 +87,7 @@ getResolution() -> <<>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPostScriptDC) -> ok. +-spec destroy(This::wxPostScriptDC()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPostScriptDC), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPreviewControlBar.erl b/lib/wx/src/gen/wxPreviewControlBar.erl index b59ac18443..dce3feb9ea 100644 --- a/lib/wx/src/gen/wxPreviewControlBar.erl +++ b/lib/wx/src/gen/wxPreviewControlBar.erl @@ -138,7 +138,7 @@ setZoomControl(#wx_ref{type=ThisT,ref=ThisRef},Zoom) <<ThisRef:32/?UI,Zoom:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPreviewControlBar) -> ok. +-spec destroy(This::wxPreviewControlBar()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPreviewControlBar), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPreviewFrame.erl b/lib/wx/src/gen/wxPreviewFrame.erl index 162e7b1621..41bb0bf2bb 100644 --- a/lib/wx/src/gen/wxPreviewFrame.erl +++ b/lib/wx/src/gen/wxPreviewFrame.erl @@ -101,7 +101,7 @@ new(Preview,Parent) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframewxpreviewframe">external documentation</a>. -spec new(Preview, Parent, [Option]) -> wxPreviewFrame() when Preview::wxPrintPreview:wxPrintPreview(), Parent::wxWindow:wxWindow(), - Option :: {title, string()} + Option :: {title, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -152,7 +152,7 @@ onCloseWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef}) <<ThisRef:32/?UI,EventRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPreviewFrame) -> ok. +-spec destroy(This::wxPreviewFrame()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPreviewFrame), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPrintData.erl b/lib/wx/src/gen/wxPrintData.erl index 5b5f872abc..2cb8dd3c5f 100644 --- a/lib/wx/src/gen/wxPrintData.erl +++ b/lib/wx/src/gen/wxPrintData.erl @@ -110,7 +110,7 @@ getPaperId(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetprintername">external documentation</a>. --spec getPrinterName(This) -> string() when +-spec getPrinterName(This) -> unicode:charlist() when This::wxPrintData(). getPrinterName(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxPrintData), @@ -200,7 +200,7 @@ setPaperId(#wx_ref{type=ThisT,ref=ThisRef},SizeId) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetprintername">external documentation</a>. -spec setPrinterName(This, Name) -> ok when - This::wxPrintData(), Name::string(). + This::wxPrintData(), Name::unicode:chardata(). setPrinterName(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxPrintData), @@ -218,7 +218,7 @@ setQuality(#wx_ref{type=ThisT,ref=ThisRef},Quality) <<ThisRef:32/?UI,Quality:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPrintData) -> ok. +-spec destroy(This::wxPrintData()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPrintData), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPrintDialog.erl b/lib/wx/src/gen/wxPrintDialog.erl index 3e38bd5f10..1316ee2feb 100644 --- a/lib/wx/src/gen/wxPrintDialog.erl +++ b/lib/wx/src/gen/wxPrintDialog.erl @@ -131,7 +131,7 @@ getPrintDC(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPrintDialog) -> ok. +-spec destroy(This::wxPrintDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPrintDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPrintDialogData.erl b/lib/wx/src/gen/wxPrintDialogData.erl index ec554bfb88..3368349164 100644 --- a/lib/wx/src/gen/wxPrintDialogData.erl +++ b/lib/wx/src/gen/wxPrintDialogData.erl @@ -263,7 +263,7 @@ setToPage(#wx_ref{type=ThisT,ref=ThisRef},V) <<ThisRef:32/?UI,V:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPrintDialogData) -> ok. +-spec destroy(This::wxPrintDialogData()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPrintDialogData), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPrintPreview.erl b/lib/wx/src/gen/wxPrintPreview.erl index 717589c871..49ab506526 100644 --- a/lib/wx/src/gen/wxPrintPreview.erl +++ b/lib/wx/src/gen/wxPrintPreview.erl @@ -208,7 +208,7 @@ setZoom(#wx_ref{type=ThisT,ref=ThisRef},Percent) <<ThisRef:32/?UI,Percent:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPrintPreview) -> ok. +-spec destroy(This::wxPrintPreview()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPrintPreview), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPrinter.erl b/lib/wx/src/gen/wxPrinter.erl index 64c70bd75f..031483da4d 100644 --- a/lib/wx/src/gen/wxPrinter.erl +++ b/lib/wx/src/gen/wxPrinter.erl @@ -119,7 +119,7 @@ printDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprinterreporterror">external documentation</a>. -spec reportError(This, Parent, Printout, Message) -> ok when - This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout(), Message::string(). + This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout(), Message::unicode:chardata(). reportError(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=PrintoutT,ref=PrintoutRef},Message) when is_list(Message) -> ?CLASS(ThisT,wxPrinter), @@ -139,7 +139,7 @@ setup(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}) -> <<ThisRef:32/?UI,ParentRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPrinter) -> ok. +-spec destroy(This::wxPrinter()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPrinter), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxPrintout.erl b/lib/wx/src/gen/wxPrintout.erl index 2afb9a54f7..ab96a09c09 100644 --- a/lib/wx/src/gen/wxPrintout.erl +++ b/lib/wx/src/gen/wxPrintout.erl @@ -169,7 +169,7 @@ getPPIScreen(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgettitle">external documentation</a>. --spec getTitle(This) -> string() when +-spec getTitle(This) -> unicode:charlist() when This::wxPrintout(). getTitle(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxPrintout), @@ -289,7 +289,7 @@ offsetLogicalOrigin(#wx_ref{type=ThisT,ref=ThisRef},Xoff,Yoff) <<ThisRef:32/?UI,Xoff:32/?UI,Yoff:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxPrintout) -> ok. +-spec destroy(This::wxPrintout()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxPrintout), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxProgressDialog.erl b/lib/wx/src/gen/wxProgressDialog.erl index 679e87aab2..0f42c1d68f 100644 --- a/lib/wx/src/gen/wxProgressDialog.erl +++ b/lib/wx/src/gen/wxProgressDialog.erl @@ -88,7 +88,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxProgressDialog() :: wx:wx_object(). %% @equiv new(Title,Message, []) -spec new(Title, Message) -> wxProgressDialog() when - Title::string(), Message::string(). + Title::unicode:chardata(), Message::unicode:chardata(). new(Title,Message) when is_list(Title),is_list(Message) -> @@ -96,7 +96,7 @@ new(Title,Message) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html#wxprogressdialogwxprogressdialog">external documentation</a>. -spec new(Title, Message, [Option]) -> wxProgressDialog() when - Title::string(), Message::string(), + Title::unicode:chardata(), Message::unicode:chardata(), Option :: {maximum, integer()} | {parent, wxWindow:wxWindow()} | {style, integer()}. @@ -139,7 +139,7 @@ update(This,Value) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html#wxprogressdialogupdate">external documentation</a>. -spec update(This, Value, [Option]) -> boolean() when This::wxProgressDialog(), Value::integer(), - Option :: {newmsg, string()}. + Option :: {newmsg, unicode:chardata()}. update(#wx_ref{type=ThisT,ref=ThisRef},Value, Options) when is_integer(Value),is_list(Options) -> ?CLASS(ThisT,wxProgressDialog), @@ -150,7 +150,7 @@ update(#wx_ref{type=ThisT,ref=ThisRef},Value, Options) <<ThisRef:32/?UI,Value:32/?UI, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxProgressDialog) -> ok. +-spec destroy(This::wxProgressDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxProgressDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxRadioBox.erl b/lib/wx/src/gen/wxRadioBox.erl index 4d02633922..d70a554267 100644 --- a/lib/wx/src/gen/wxRadioBox.erl +++ b/lib/wx/src/gen/wxRadioBox.erl @@ -82,7 +82,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxRadioBox() :: wx:wx_object(). %% @equiv new(Parent,Id,Title,Pos,Size,Choices, []) -spec new(Parent, Id, Title, Pos, Size, Choices) -> wxRadioBox() when - Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]]. + Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]]. new(Parent,Id,Title,Pos={PosX,PosY},Size={SizeW,SizeH},Choices) when is_record(Parent, wx_ref),is_integer(Id),is_list(Title),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) -> @@ -90,7 +90,7 @@ new(Parent,Id,Title,Pos={PosX,PosY},Size={SizeW,SizeH},Choices) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxwxradiobox">external documentation</a>. -spec new(Parent, Id, Title, Pos, Size, Choices, [Option]) -> wxRadioBox() when - Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]], + Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]], Option :: {majorDim, integer()} | {style, integer()} | {val, wx:wx()}. @@ -110,7 +110,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title,{PosX,PosY},{SizeW,SizeH},Choic %% @equiv create(This,Parent,Id,Title,Pos,Size,Choices, []) -spec create(This, Parent, Id, Title, Pos, Size, Choices) -> boolean() when - This::wxRadioBox(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]]. + This::wxRadioBox(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]]. create(This,Parent,Id,Title,Pos={PosX,PosY},Size={SizeW,SizeH},Choices) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) -> @@ -118,7 +118,7 @@ create(This,Parent,Id,Title,Pos={PosX,PosY},Size={SizeW,SizeH},Choices) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxcreate">external documentation</a>. -spec create(This, Parent, Id, Title, Pos, Size, Choices, [Option]) -> boolean() when - This::wxRadioBox(), Parent::wxWindow:wxWindow(), Id::integer(), Title::string(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[string()]], + This::wxRadioBox(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[[unicode:chardata()]], Option :: {majorDim, integer()} | {style, integer()} | {val, wx:wx()}. @@ -186,7 +186,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetstring">external documentation</a>. --spec getString(This, N) -> string() when +-spec getString(This, N) -> unicode:charlist() when This::wxRadioBox(), N::integer(). getString(#wx_ref{type=ThisT,ref=ThisRef},N) when is_integer(N) -> @@ -252,7 +252,7 @@ getColumnCount(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetitemhelptext">external documentation</a>. --spec getItemHelpText(This, N) -> string() when +-spec getItemHelpText(This, N) -> unicode:charlist() when This::wxRadioBox(), N::integer(). getItemHelpText(#wx_ref{type=ThisT,ref=ThisRef},N) when is_integer(N) -> @@ -306,7 +306,7 @@ isItemShown(#wx_ref{type=ThisT,ref=ThisRef},N) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxsetitemhelptext">external documentation</a>. -spec setItemHelpText(This, N, HelpText) -> ok when - This::wxRadioBox(), N::integer(), HelpText::string(). + This::wxRadioBox(), N::integer(), HelpText::unicode:chardata(). setItemHelpText(#wx_ref{type=ThisT,ref=ThisRef},N,HelpText) when is_integer(N),is_list(HelpText) -> ?CLASS(ThisT,wxRadioBox), @@ -316,7 +316,7 @@ setItemHelpText(#wx_ref{type=ThisT,ref=ThisRef},N,HelpText) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxsetitemtooltip">external documentation</a>. -spec setItemToolTip(This, Item, Text) -> ok when - This::wxRadioBox(), Item::integer(), Text::string(). + This::wxRadioBox(), Item::integer(), Text::unicode:chardata(). setItemToolTip(#wx_ref{type=ThisT,ref=ThisRef},Item,Text) when is_integer(Item),is_list(Text) -> ?CLASS(ThisT,wxRadioBox), @@ -325,7 +325,7 @@ setItemToolTip(#wx_ref{type=ThisT,ref=ThisRef},Item,Text) <<ThisRef:32/?UI,Item:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxRadioBox) -> ok. +-spec destroy(This::wxRadioBox()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxRadioBox), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxRadioButton.erl b/lib/wx/src/gen/wxRadioButton.erl index d95972da22..a013bd65e4 100644 --- a/lib/wx/src/gen/wxRadioButton.erl +++ b/lib/wx/src/gen/wxRadioButton.erl @@ -85,7 +85,7 @@ new() -> %% @equiv new(Parent,Id,Label, []) -spec new(Parent, Id, Label) -> wxRadioButton() when - Parent::wxWindow:wxWindow(), Id::integer(), Label::string(). + Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(). new(Parent,Id,Label) when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) -> @@ -93,7 +93,7 @@ new(Parent,Id,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttonwxradiobutton">external documentation</a>. -spec new(Parent, Id, Label, [Option]) -> wxRadioButton() when - Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), + Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -113,7 +113,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options) %% @equiv create(This,Parent,Id,Label, []) -spec create(This, Parent, Id, Label) -> boolean() when - This::wxRadioButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(). + This::wxRadioButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(). create(This,Parent,Id,Label) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) -> @@ -121,7 +121,7 @@ create(This,Parent,Id,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttoncreate">external documentation</a>. -spec create(This, Parent, Id, Label, [Option]) -> boolean() when - This::wxRadioButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), + This::wxRadioButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -158,7 +158,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Val) <<ThisRef:32/?UI,(wxe_util:from_bool(Val)):32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxRadioButton) -> ok. +-spec destroy(This::wxRadioButton()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxRadioButton), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxRegion.erl b/lib/wx/src/gen/wxRegion.erl index 0239558a5a..3397cc7e81 100644 --- a/lib/wx/src/gen/wxRegion.erl +++ b/lib/wx/src/gen/wxRegion.erl @@ -288,7 +288,7 @@ union(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H) <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxRegion) -> ok. +-spec destroy(This::wxRegion()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxRegion), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxSashLayoutWindow.erl b/lib/wx/src/gen/wxSashLayoutWindow.erl index 252ff4d7dd..f833f59479 100644 --- a/lib/wx/src/gen/wxSashLayoutWindow.erl +++ b/lib/wx/src/gen/wxSashLayoutWindow.erl @@ -191,7 +191,7 @@ setOrientation(#wx_ref{type=ThisT,ref=ThisRef},Orient) <<ThisRef:32/?UI,Orient:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxSashLayoutWindow) -> ok. +-spec destroy(This::wxSashLayoutWindow()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSashLayoutWindow), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxSashWindow.erl b/lib/wx/src/gen/wxSashWindow.erl index c3f0d17eb4..7d85e05af8 100644 --- a/lib/wx/src/gen/wxSashWindow.erl +++ b/lib/wx/src/gen/wxSashWindow.erl @@ -199,7 +199,7 @@ setSashVisible(#wx_ref{type=ThisT,ref=ThisRef},Edge,Sash) <<ThisRef:32/?UI,Edge:32/?UI,(wxe_util:from_bool(Sash)):32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxSashWindow) -> ok. +-spec destroy(This::wxSashWindow()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSashWindow), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxScreenDC.erl b/lib/wx/src/gen/wxScreenDC.erl index ef2090b6d1..f9ab60d389 100644 --- a/lib/wx/src/gen/wxScreenDC.erl +++ b/lib/wx/src/gen/wxScreenDC.erl @@ -65,7 +65,7 @@ new() -> <<>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxScreenDC) -> ok. +-spec destroy(This::wxScreenDC()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxScreenDC), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxScrollBar.erl b/lib/wx/src/gen/wxScrollBar.erl index baa5918c9e..30272312ab 100644 --- a/lib/wx/src/gen/wxScrollBar.erl +++ b/lib/wx/src/gen/wxScrollBar.erl @@ -202,7 +202,7 @@ setScrollbar(#wx_ref{type=ThisT,ref=ThisRef},Position,ThumbSize,Range,PageSize, <<ThisRef:32/?UI,Position:32/?UI,ThumbSize:32/?UI,Range:32/?UI,PageSize:32/?UI, 0:32,BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxScrollBar) -> ok. +-spec destroy(This::wxScrollBar()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxScrollBar), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxScrolledWindow.erl b/lib/wx/src/gen/wxScrolledWindow.erl index b4ecc68a6c..9141487a8c 100644 --- a/lib/wx/src/gen/wxScrolledWindow.erl +++ b/lib/wx/src/gen/wxScrolledWindow.erl @@ -245,7 +245,7 @@ setTargetWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TargetT,ref=TargetR <<ThisRef:32/?UI,TargetRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxScrolledWindow) -> ok. +-spec destroy(This::wxScrolledWindow()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxScrolledWindow), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxSingleChoiceDialog.erl b/lib/wx/src/gen/wxSingleChoiceDialog.erl index 741e935e41..6f96e283c8 100644 --- a/lib/wx/src/gen/wxSingleChoiceDialog.erl +++ b/lib/wx/src/gen/wxSingleChoiceDialog.erl @@ -94,7 +94,7 @@ new() -> %% @equiv new(Parent,Message,Caption,Choices, []) -spec new(Parent, Message, Caption, Choices) -> wxSingleChoiceDialog() when - Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]]. + Parent::wxWindow:wxWindow(), Message::unicode:chardata(), Caption::unicode:chardata(), Choices::[[unicode:chardata()]]. new(Parent,Message,Caption,Choices) when is_record(Parent, wx_ref),is_list(Message),is_list(Caption),is_list(Choices) -> @@ -102,7 +102,7 @@ new(Parent,Message,Caption,Choices) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialogwxsinglechoicedialog">external documentation</a>. -spec new(Parent, Message, Caption, Choices, [Option]) -> wxSingleChoiceDialog() when - Parent::wxWindow:wxWindow(), Message::string(), Caption::string(), Choices::[[string()]], + Parent::wxWindow:wxWindow(), Message::unicode:chardata(), Caption::unicode:chardata(), Choices::[[unicode:chardata()]], Option :: {style, integer()} | {pos, {X::integer(), Y::integer()}}. new(#wx_ref{type=ParentT,ref=ParentRef},Message,Caption,Choices, Options) @@ -128,7 +128,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialoggetstringselection">external documentation</a>. --spec getStringSelection(This) -> string() when +-spec getStringSelection(This) -> unicode:charlist() when This::wxSingleChoiceDialog(). getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxSingleChoiceDialog), @@ -145,7 +145,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},Sel) <<ThisRef:32/?UI,Sel:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxSingleChoiceDialog) -> ok. +-spec destroy(This::wxSingleChoiceDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSingleChoiceDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxSizerFlags.erl b/lib/wx/src/gen/wxSizerFlags.erl index e3bf7fed95..08d36d1a80 100644 --- a/lib/wx/src/gen/wxSizerFlags.erl +++ b/lib/wx/src/gen/wxSizerFlags.erl @@ -141,7 +141,7 @@ right(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxSizerFlags) -> ok. +-spec destroy(This::wxSizerFlags()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSizerFlags), wxe_util:destroy(?wxSizerFlags_destroy,Obj), diff --git a/lib/wx/src/gen/wxSizerItem.erl b/lib/wx/src/gen/wxSizerItem.erl index 75f3c6f805..7a0ce1e508 100644 --- a/lib/wx/src/gen/wxSizerItem.erl +++ b/lib/wx/src/gen/wxSizerItem.erl @@ -381,7 +381,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef},Show) <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxSizerItem) -> ok. +-spec destroy(This::wxSizerItem()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSizerItem), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxSlider.erl b/lib/wx/src/gen/wxSlider.erl index bd00e71476..e951e559ca 100644 --- a/lib/wx/src/gen/wxSlider.erl +++ b/lib/wx/src/gen/wxSlider.erl @@ -234,7 +234,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Value) <<ThisRef:32/?UI,Value:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxSlider) -> ok. +-spec destroy(This::wxSlider()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSlider), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxSpinButton.erl b/lib/wx/src/gen/wxSpinButton.erl index 0e987a0f09..0f1dea75b6 100644 --- a/lib/wx/src/gen/wxSpinButton.erl +++ b/lib/wx/src/gen/wxSpinButton.erl @@ -182,7 +182,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Value) <<ThisRef:32/?UI,Value:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxSpinButton) -> ok. +-spec destroy(This::wxSpinButton()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSpinButton), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxSpinCtrl.erl b/lib/wx/src/gen/wxSpinCtrl.erl index 5de7619b34..17d7e49a8d 100644 --- a/lib/wx/src/gen/wxSpinCtrl.erl +++ b/lib/wx/src/gen/wxSpinCtrl.erl @@ -96,7 +96,7 @@ new(Parent) -spec new(Parent, [Option]) -> wxSpinCtrl() when Parent::wxWindow:wxWindow(), Option :: {id, integer()} - | {value, string()} + | {value, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -131,7 +131,7 @@ create(This,Parent) -spec create(This, Parent, [Option]) -> boolean() when This::wxSpinCtrl(), Parent::wxWindow:wxWindow(), Option :: {id, integer()} - | {value, string()} + | {value, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -159,7 +159,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti -spec setValue(This, Value) -> ok when This::wxSpinCtrl(), Value::integer(); (This, Text) -> ok when - This::wxSpinCtrl(), Text::string(). + This::wxSpinCtrl(), Text::unicode:chardata(). setValue(#wx_ref{type=ThisT,ref=ThisRef},Value) when is_integer(Value) -> ?CLASS(ThisT,wxSpinCtrl), @@ -215,7 +215,7 @@ getMax(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxSpinCtrl) -> ok. +-spec destroy(This::wxSpinCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSpinCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxSplashScreen.erl b/lib/wx/src/gen/wxSplashScreen.erl index e6755690e0..2222f5e64e 100644 --- a/lib/wx/src/gen/wxSplashScreen.erl +++ b/lib/wx/src/gen/wxSplashScreen.erl @@ -138,7 +138,7 @@ getTimeout(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxSplashScreen) -> ok. +-spec destroy(This::wxSplashScreen()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSplashScreen), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxSplitterWindow.erl b/lib/wx/src/gen/wxSplitterWindow.erl index d72be1c8e8..231f93911f 100644 --- a/lib/wx/src/gen/wxSplitterWindow.erl +++ b/lib/wx/src/gen/wxSplitterWindow.erl @@ -350,7 +350,7 @@ updateSize(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxSplitterWindow) -> ok. +-spec destroy(This::wxSplitterWindow()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSplitterWindow), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxStaticBitmap.erl b/lib/wx/src/gen/wxStaticBitmap.erl index e16cd7ef21..02272c8107 100644 --- a/lib/wx/src/gen/wxStaticBitmap.erl +++ b/lib/wx/src/gen/wxStaticBitmap.erl @@ -154,7 +154,7 @@ setBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) - <<ThisRef:32/?UI,BitmapRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxStaticBitmap) -> ok. +-spec destroy(This::wxStaticBitmap()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxStaticBitmap), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxStaticBox.erl b/lib/wx/src/gen/wxStaticBox.erl index 0b02cb43e4..e4e390610a 100644 --- a/lib/wx/src/gen/wxStaticBox.erl +++ b/lib/wx/src/gen/wxStaticBox.erl @@ -85,7 +85,7 @@ new() -> %% @equiv new(Parent,Id,Label, []) -spec new(Parent, Id, Label) -> wxStaticBox() when - Parent::wxWindow:wxWindow(), Id::integer(), Label::string(). + Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(). new(Parent,Id,Label) when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) -> @@ -93,7 +93,7 @@ new(Parent,Id,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbox.html#wxstaticboxwxstaticbox">external documentation</a>. -spec new(Parent, Id, Label, [Option]) -> wxStaticBox() when - Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), + Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -111,7 +111,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options) %% @equiv create(This,Parent,Id,Label, []) -spec create(This, Parent, Id, Label) -> boolean() when - This::wxStaticBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(). + This::wxStaticBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(). create(This,Parent,Id,Label) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) -> @@ -119,7 +119,7 @@ create(This,Parent,Id,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbox.html#wxstaticboxcreate">external documentation</a>. -spec create(This, Parent, Id, Label, [Option]) -> boolean() when - This::wxStaticBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), + This::wxStaticBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -137,7 +137,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxStaticBox) -> ok. +-spec destroy(This::wxStaticBox()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxStaticBox), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxStaticBoxSizer.erl b/lib/wx/src/gen/wxStaticBoxSizer.erl index c73563d4cf..32e6250502 100644 --- a/lib/wx/src/gen/wxStaticBoxSizer.erl +++ b/lib/wx/src/gen/wxStaticBoxSizer.erl @@ -66,7 +66,7 @@ new(#wx_ref{type=BoxT,ref=BoxRef},Orient) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticboxsizer.html#wxstaticboxsizerwxstaticboxsizer">external documentation</a>. -spec new(Orient, Win, [Option]) -> wxStaticBoxSizer() when Orient::integer(), Win::wxWindow:wxWindow(), - Option :: {label, string()}. + Option :: {label, unicode:chardata()}. new(Orient,#wx_ref{type=WinT,ref=WinRef}, Options) when is_integer(Orient),is_list(Options) -> ?CLASS(WinT,wxWindow), @@ -85,7 +85,7 @@ getStaticBox(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxStaticBoxSizer) -> ok. +-spec destroy(This::wxStaticBoxSizer()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxStaticBoxSizer), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxStaticLine.erl b/lib/wx/src/gen/wxStaticLine.erl index 6298f449d4..86a9975312 100644 --- a/lib/wx/src/gen/wxStaticLine.erl +++ b/lib/wx/src/gen/wxStaticLine.erl @@ -154,7 +154,7 @@ getDefaultSize() -> <<>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxStaticLine) -> ok. +-spec destroy(This::wxStaticLine()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxStaticLine), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxStaticText.erl b/lib/wx/src/gen/wxStaticText.erl index 5aa4b6a7e0..de779f66fc 100644 --- a/lib/wx/src/gen/wxStaticText.erl +++ b/lib/wx/src/gen/wxStaticText.erl @@ -85,7 +85,7 @@ new() -> %% @equiv new(Parent,Id,Label, []) -spec new(Parent, Id, Label) -> wxStaticText() when - Parent::wxWindow:wxWindow(), Id::integer(), Label::string(). + Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(). new(Parent,Id,Label) when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) -> @@ -93,7 +93,7 @@ new(Parent,Id,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextwxstatictext">external documentation</a>. -spec new(Parent, Id, Label, [Option]) -> wxStaticText() when - Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), + Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -111,7 +111,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options) %% @equiv create(This,Parent,Id,Label, []) -spec create(This, Parent, Id, Label) -> boolean() when - This::wxStaticText(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(). + This::wxStaticText(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(). create(This,Parent,Id,Label) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) -> @@ -119,7 +119,7 @@ create(This,Parent,Id,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextcreate">external documentation</a>. -spec create(This, Parent, Id, Label, [Option]) -> boolean() when - This::wxStaticText(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), + This::wxStaticText(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}. @@ -137,7 +137,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextgetlabel">external documentation</a>. --spec getLabel(This) -> string() when +-spec getLabel(This) -> unicode:charlist() when This::wxStaticText(). getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxStaticText), @@ -146,7 +146,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextsetlabel">external documentation</a>. -spec setLabel(This, Label) -> ok when - This::wxStaticText(), Label::string(). + This::wxStaticText(), Label::unicode:chardata(). setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label) when is_list(Label) -> ?CLASS(ThisT,wxStaticText), @@ -164,7 +164,7 @@ wrap(#wx_ref{type=ThisT,ref=ThisRef},Width) <<ThisRef:32/?UI,Width:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxStaticText) -> ok. +-spec destroy(This::wxStaticText()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxStaticText), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxStatusBar.erl b/lib/wx/src/gen/wxStatusBar.erl index 4b43a8e30b..31dab03b56 100644 --- a/lib/wx/src/gen/wxStatusBar.erl +++ b/lib/wx/src/gen/wxStatusBar.erl @@ -149,7 +149,7 @@ getFieldsCount(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @equiv getStatusText(This, []) --spec getStatusText(This) -> string() when +-spec getStatusText(This) -> unicode:charlist() when This::wxStatusBar(). getStatusText(This) @@ -157,7 +157,7 @@ getStatusText(This) getStatusText(This, []). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbargetstatustext">external documentation</a>. --spec getStatusText(This, [Option]) -> string() when +-spec getStatusText(This, [Option]) -> unicode:charlist() when This::wxStatusBar(), Option :: {number, integer()}. getStatusText(#wx_ref{type=ThisT,ref=ThisRef}, Options) @@ -192,7 +192,7 @@ popStatusText(#wx_ref{type=ThisT,ref=ThisRef}, Options) %% @equiv pushStatusText(This,Text, []) -spec pushStatusText(This, Text) -> ok when - This::wxStatusBar(), Text::string(). + This::wxStatusBar(), Text::unicode:chardata(). pushStatusText(This,Text) when is_record(This, wx_ref),is_list(Text) -> @@ -200,7 +200,7 @@ pushStatusText(This,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarpushstatustext">external documentation</a>. -spec pushStatusText(This, Text, [Option]) -> ok when - This::wxStatusBar(), Text::string(), + This::wxStatusBar(), Text::unicode:chardata(), Option :: {number, integer()}. pushStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options) when is_list(Text),is_list(Options) -> @@ -245,7 +245,7 @@ setMinHeight(#wx_ref{type=ThisT,ref=ThisRef},Height) %% @equiv setStatusText(This,Text, []) -spec setStatusText(This, Text) -> ok when - This::wxStatusBar(), Text::string(). + This::wxStatusBar(), Text::unicode:chardata(). setStatusText(This,Text) when is_record(This, wx_ref),is_list(Text) -> @@ -253,7 +253,7 @@ setStatusText(This,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetstatustext">external documentation</a>. -spec setStatusText(This, Text, [Option]) -> ok when - This::wxStatusBar(), Text::string(), + This::wxStatusBar(), Text::unicode:chardata(), Option :: {number, integer()}. setStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options) when is_list(Text),is_list(Options) -> @@ -286,7 +286,7 @@ setStatusStyles(#wx_ref{type=ThisT,ref=ThisRef},Styles) (<< <<C:32/?I>> || C <- Styles>>)/binary, 0:(((0+length(Styles)) rem 2)*32)>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxStatusBar) -> ok. +-spec destroy(This::wxStatusBar()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxStatusBar), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxStdDialogButtonSizer.erl b/lib/wx/src/gen/wxStdDialogButtonSizer.erl index b8c17ab6ac..078763e7cb 100644 --- a/lib/wx/src/gen/wxStdDialogButtonSizer.erl +++ b/lib/wx/src/gen/wxStdDialogButtonSizer.erl @@ -100,7 +100,7 @@ setNegativeButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=Butto <<ThisRef:32/?UI,ButtonRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxStdDialogButtonSizer) -> ok. +-spec destroy(This::wxStdDialogButtonSizer()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxStdDialogButtonSizer), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxStyledTextCtrl.erl b/lib/wx/src/gen/wxStyledTextCtrl.erl index fdbe4faec0..0271548cad 100644 --- a/lib/wx/src/gen/wxStyledTextCtrl.erl +++ b/lib/wx/src/gen/wxStyledTextCtrl.erl @@ -242,7 +242,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrladdtext">external documentation</a>. -spec addText(This, Text) -> ok when - This::wxStyledTextCtrl(), Text::string(). + This::wxStyledTextCtrl(), Text::unicode:chardata(). addText(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -261,7 +261,7 @@ addStyledText(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) - %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlinserttext">external documentation</a>. -spec insertText(This, Pos, Text) -> ok when - This::wxStyledTextCtrl(), Pos::integer(), Text::string(). + This::wxStyledTextCtrl(), Pos::integer(), Text::unicode:chardata(). insertText(#wx_ref{type=ThisT,ref=ThisRef},Pos,Text) when is_integer(Pos),is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -467,7 +467,7 @@ setAnchor(#wx_ref{type=ThisT,ref=ThisRef},PosAnchor) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurline">external documentation</a>. -spec getCurLine(This) -> Result when - Result ::{Res ::string(), LinePos::integer()}, + Result ::{Res ::unicode:charlist(), LinePos::integer()}, This::wxStyledTextCtrl(). getCurLine(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -819,7 +819,7 @@ styleSetSize(#wx_ref{type=ThisT,ref=ThisRef},Style,SizePoints) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfacename">external documentation</a>. -spec styleSetFaceName(This, Style, FontName) -> ok when - This::wxStyledTextCtrl(), Style::integer(), FontName::string(). + This::wxStyledTextCtrl(), Style::integer(), FontName::unicode:chardata(). styleSetFaceName(#wx_ref{type=ThisT,ref=ThisRef},Style,FontName) when is_integer(Style),is_list(FontName) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -978,7 +978,7 @@ setCaretPeriod(#wx_ref{type=ThisT,ref=ThisRef},PeriodMilliseconds) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwordchars">external documentation</a>. -spec setWordChars(This, Characters) -> ok when - This::wxStyledTextCtrl(), Characters::string(). + This::wxStyledTextCtrl(), Characters::unicode:chardata(). setWordChars(#wx_ref{type=ThisT,ref=ThisRef},Characters) when is_list(Characters) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1030,7 +1030,7 @@ indicatorSetForeground(#wx_ref{type=ThisT,ref=ThisRef},Indic,Fore) <<ThisRef:32/?UI,Indic:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorgetforeground">external documentation</a>. --spec indicatorGetForeground(This, Indic) -> wx:wx_colour() when +-spec indicatorGetForeground(This, Indic) -> wx:wx_colour4() when This::wxStyledTextCtrl(), Indic::integer(). indicatorGetForeground(#wx_ref{type=ThisT,ref=ThisRef},Indic) when is_integer(Indic) -> @@ -1108,7 +1108,7 @@ setCaretLineVisible(#wx_ref{type=ThisT,ref=ThisRef},Show) <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretlinebackground">external documentation</a>. --spec getCaretLineBackground(This) -> wx:wx_colour() when +-spec getCaretLineBackground(This) -> wx:wx_colour4() when This::wxStyledTextCtrl(). getCaretLineBackground(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1126,7 +1126,7 @@ setCaretLineBackground(#wx_ref{type=ThisT,ref=ThisRef},Back) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompshow">external documentation</a>. -spec autoCompShow(This, LenEntered, ItemList) -> ok when - This::wxStyledTextCtrl(), LenEntered::integer(), ItemList::string(). + This::wxStyledTextCtrl(), LenEntered::integer(), ItemList::unicode:chardata(). autoCompShow(#wx_ref{type=ThisT,ref=ThisRef},LenEntered,ItemList) when is_integer(LenEntered),is_list(ItemList) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1168,7 +1168,7 @@ autoCompComplete(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompstops">external documentation</a>. -spec autoCompStops(This, CharacterSet) -> ok when - This::wxStyledTextCtrl(), CharacterSet::string(). + This::wxStyledTextCtrl(), CharacterSet::unicode:chardata(). autoCompStops(#wx_ref{type=ThisT,ref=ThisRef},CharacterSet) when is_list(CharacterSet) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1195,7 +1195,7 @@ autoCompGetSeparator(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompselect">external documentation</a>. -spec autoCompSelect(This, Text) -> ok when - This::wxStyledTextCtrl(), Text::string(). + This::wxStyledTextCtrl(), Text::unicode:chardata(). autoCompSelect(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1222,7 +1222,7 @@ autoCompGetCancelAtStart(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetfillups">external documentation</a>. -spec autoCompSetFillUps(This, CharacterSet) -> ok when - This::wxStyledTextCtrl(), CharacterSet::string(). + This::wxStyledTextCtrl(), CharacterSet::unicode:chardata(). autoCompSetFillUps(#wx_ref{type=ThisT,ref=ThisRef},CharacterSet) when is_list(CharacterSet) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1266,7 +1266,7 @@ autoCompGetIgnoreCase(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrluserlistshow">external documentation</a>. -spec userListShow(This, ListType, ItemList) -> ok when - This::wxStyledTextCtrl(), ListType::integer(), ItemList::string(). + This::wxStyledTextCtrl(), ListType::integer(), ItemList::unicode:chardata(). userListShow(#wx_ref{type=ThisT,ref=ThisRef},ListType,ItemList) when is_integer(ListType),is_list(ItemList) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1516,7 +1516,7 @@ getCodePage(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretforeground">external documentation</a>. --spec getCaretForeground(This) -> wx:wx_colour() when +-spec getCaretForeground(This) -> wx:wx_colour4() when This::wxStyledTextCtrl(). getCaretForeground(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1610,7 +1610,7 @@ getPrintColourMode(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @equiv findText(This,MinPos,MaxPos,Text, []) -spec findText(This, MinPos, MaxPos, Text) -> integer() when - This::wxStyledTextCtrl(), MinPos::integer(), MaxPos::integer(), Text::string(). + This::wxStyledTextCtrl(), MinPos::integer(), MaxPos::integer(), Text::unicode:chardata(). findText(This,MinPos,MaxPos,Text) when is_record(This, wx_ref),is_integer(MinPos),is_integer(MaxPos),is_list(Text) -> @@ -1618,7 +1618,7 @@ findText(This,MinPos,MaxPos,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlfindtext">external documentation</a>. -spec findText(This, MinPos, MaxPos, Text, [Option]) -> integer() when - This::wxStyledTextCtrl(), MinPos::integer(), MaxPos::integer(), Text::string(), + This::wxStyledTextCtrl(), MinPos::integer(), MaxPos::integer(), Text::unicode:chardata(), Option :: {flags, integer()}. findText(#wx_ref{type=ThisT,ref=ThisRef},MinPos,MaxPos,Text, Options) when is_integer(MinPos),is_integer(MaxPos),is_list(Text),is_list(Options) -> @@ -1650,7 +1650,7 @@ getFirstVisibleLine(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetline">external documentation</a>. --spec getLine(This, Line) -> string() when +-spec getLine(This, Line) -> unicode:charlist() when This::wxStyledTextCtrl(), Line::integer(). getLine(#wx_ref{type=ThisT,ref=ThisRef},Line) when is_integer(Line) -> @@ -1718,7 +1718,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},Start,End) <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectedtext">external documentation</a>. --spec getSelectedText(This) -> string() when +-spec getSelectedText(This) -> unicode:charlist() when This::wxStyledTextCtrl(). getSelectedText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1726,7 +1726,7 @@ getSelectedText(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextrange">external documentation</a>. --spec getTextRange(This, StartPos, EndPos) -> string() when +-spec getTextRange(This, StartPos, EndPos) -> unicode:charlist() when This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer(). getTextRange(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos) when is_integer(StartPos),is_integer(EndPos) -> @@ -1780,7 +1780,7 @@ ensureCaretVisible(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlreplaceselection">external documentation</a>. -spec replaceSelection(This, Text) -> ok when - This::wxStyledTextCtrl(), Text::string(). + This::wxStyledTextCtrl(), Text::unicode:chardata(). replaceSelection(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1863,7 +1863,7 @@ clear(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettext">external documentation</a>. -spec setText(This, Text) -> ok when - This::wxStyledTextCtrl(), Text::string(). + This::wxStyledTextCtrl(), Text::unicode:chardata(). setText(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1872,7 +1872,7 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Text) <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettext">external documentation</a>. --spec getText(This) -> string() when +-spec getText(This) -> unicode:charlist() when This::wxStyledTextCtrl(). getText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1948,7 +1948,7 @@ getTargetEnd(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlreplacetarget">external documentation</a>. -spec replaceTarget(This, Text) -> integer() when - This::wxStyledTextCtrl(), Text::string(). + This::wxStyledTextCtrl(), Text::unicode:chardata(). replaceTarget(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1958,7 +1958,7 @@ replaceTarget(#wx_ref{type=ThisT,ref=ThisRef},Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchintarget">external documentation</a>. -spec searchInTarget(This, Text) -> integer() when - This::wxStyledTextCtrl(), Text::string(). + This::wxStyledTextCtrl(), Text::unicode:chardata(). searchInTarget(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -1985,7 +1985,7 @@ getSearchFlags(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipshow">external documentation</a>. -spec callTipShow(This, Pos, Definition) -> ok when - This::wxStyledTextCtrl(), Pos::integer(), Definition::string(). + This::wxStyledTextCtrl(), Pos::integer(), Definition::unicode:chardata(). callTipShow(#wx_ref{type=ThisT,ref=ThisRef},Pos,Definition) when is_integer(Pos),is_list(Definition) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -2379,7 +2379,7 @@ getScrollWidth(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltextwidth">external documentation</a>. -spec textWidth(This, Style, Text) -> integer() when - This::wxStyledTextCtrl(), Style::integer(), Text::string(). + This::wxStyledTextCtrl(), Style::integer(), Text::unicode:chardata(). textWidth(#wx_ref{type=ThisT,ref=ThisRef},Style,Text) when is_integer(Style),is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -2423,7 +2423,7 @@ getUseVerticalScrollBar(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlappendtext">external documentation</a>. -spec appendText(This, Text) -> ok when - This::wxStyledTextCtrl(), Text::string(). + This::wxStyledTextCtrl(), Text::unicode:chardata(). appendText(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3035,7 +3035,7 @@ getEdgeMode(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetedgecolour">external documentation</a>. --spec getEdgeColour(This) -> wx:wx_colour() when +-spec getEdgeColour(This) -> wx:wx_colour4() when This::wxStyledTextCtrl(). getEdgeColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3061,7 +3061,7 @@ searchAnchor(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchnext">external documentation</a>. -spec searchNext(This, Flags, Text) -> integer() when - This::wxStyledTextCtrl(), Flags::integer(), Text::string(). + This::wxStyledTextCtrl(), Flags::integer(), Text::unicode:chardata(). searchNext(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text) when is_integer(Flags),is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3071,7 +3071,7 @@ searchNext(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchprev">external documentation</a>. -spec searchPrev(This, Flags, Text) -> integer() when - This::wxStyledTextCtrl(), Flags::integer(), Text::string(). + This::wxStyledTextCtrl(), Flags::integer(), Text::unicode:chardata(). searchPrev(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text) when is_integer(Flags),is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3402,7 +3402,7 @@ copyRange(#wx_ref{type=ThisT,ref=ThisRef},Start,End) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcopytext">external documentation</a>. -spec copyText(This, Length, Text) -> ok when - This::wxStyledTextCtrl(), Length::integer(), Text::string(). + This::wxStyledTextCtrl(), Length::integer(), Text::unicode:chardata(). copyText(#wx_ref{type=ThisT,ref=ThisRef},Length,Text) when is_integer(Length),is_list(Text) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3565,7 +3565,7 @@ wordRightEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwhitespacechars">external documentation</a>. -spec setWhitespaceChars(This, Characters) -> ok when - This::wxStyledTextCtrl(), Characters::string(). + This::wxStyledTextCtrl(), Characters::unicode:chardata(). setWhitespaceChars(#wx_ref{type=ThisT,ref=ThisRef},Characters) when is_list(Characters) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3718,7 +3718,7 @@ colourise(#wx_ref{type=ThisT,ref=ThisRef},Start,End) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetproperty">external documentation</a>. -spec setProperty(This, Key, Value) -> ok when - This::wxStyledTextCtrl(), Key::string(), Value::string(). + This::wxStyledTextCtrl(), Key::unicode:chardata(), Value::unicode:chardata(). setProperty(#wx_ref{type=ThisT,ref=ThisRef},Key,Value) when is_list(Key),is_list(Value) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3729,7 +3729,7 @@ setProperty(#wx_ref{type=ThisT,ref=ThisRef},Key,Value) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetkeywords">external documentation</a>. -spec setKeyWords(This, KeywordSet, KeyWords) -> ok when - This::wxStyledTextCtrl(), KeywordSet::integer(), KeyWords::string(). + This::wxStyledTextCtrl(), KeywordSet::integer(), KeyWords::unicode:chardata(). setKeyWords(#wx_ref{type=ThisT,ref=ThisRef},KeywordSet,KeyWords) when is_integer(KeywordSet),is_list(KeyWords) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3739,7 +3739,7 @@ setKeyWords(#wx_ref{type=ThisT,ref=ThisRef},KeywordSet,KeyWords) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlexerlanguage">external documentation</a>. -spec setLexerLanguage(This, Language) -> ok when - This::wxStyledTextCtrl(), Language::string(). + This::wxStyledTextCtrl(), Language::unicode:chardata(). setLexerLanguage(#wx_ref{type=ThisT,ref=ThisRef},Language) when is_list(Language) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3748,8 +3748,8 @@ setLexerLanguage(#wx_ref{type=ThisT,ref=ThisRef},Language) <<ThisRef:32/?UI,(byte_size(Language_UC)):32/?UI,(Language_UC)/binary, 0:(((8- ((0+byte_size(Language_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetproperty">external documentation</a>. --spec getProperty(This, Key) -> string() when - This::wxStyledTextCtrl(), Key::string(). +-spec getProperty(This, Key) -> unicode:charlist() when + This::wxStyledTextCtrl(), Key::unicode:chardata(). getProperty(#wx_ref{type=ThisT,ref=ThisRef},Key) when is_list(Key) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3775,7 +3775,7 @@ getCurrentLine(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetspec">external documentation</a>. -spec styleSetSpec(This, StyleNum, Spec) -> ok when - This::wxStyledTextCtrl(), StyleNum::integer(), Spec::string(). + This::wxStyledTextCtrl(), StyleNum::integer(), Spec::unicode:chardata(). styleSetSpec(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,Spec) when is_integer(StyleNum),is_list(Spec) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3795,7 +3795,7 @@ styleSetFont(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,#wx_ref{type=FontT,ref=Fon %% @equiv styleSetFontAttr(This,StyleNum,Size,FaceName,Bold,Italic,Underline, []) -spec styleSetFontAttr(This, StyleNum, Size, FaceName, Bold, Italic, Underline) -> ok when - This::wxStyledTextCtrl(), StyleNum::integer(), Size::integer(), FaceName::string(), Bold::boolean(), Italic::boolean(), Underline::boolean(). + This::wxStyledTextCtrl(), StyleNum::integer(), Size::integer(), FaceName::unicode:chardata(), Bold::boolean(), Italic::boolean(), Underline::boolean(). styleSetFontAttr(This,StyleNum,Size,FaceName,Bold,Italic,Underline) when is_record(This, wx_ref),is_integer(StyleNum),is_integer(Size),is_list(FaceName),is_boolean(Bold),is_boolean(Italic),is_boolean(Underline) -> @@ -3804,7 +3804,7 @@ styleSetFontAttr(This,StyleNum,Size,FaceName,Bold,Italic,Underline) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfontattr">external documentation</a>. %%<br /> Encoding = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS -spec styleSetFontAttr(This, StyleNum, Size, FaceName, Bold, Italic, Underline, [Option]) -> ok when - This::wxStyledTextCtrl(), StyleNum::integer(), Size::integer(), FaceName::string(), Bold::boolean(), Italic::boolean(), Underline::boolean(), + This::wxStyledTextCtrl(), StyleNum::integer(), Size::integer(), FaceName::unicode:chardata(), Bold::boolean(), Italic::boolean(), Underline::boolean(), Option :: {encoding, wx:wx_enum()}. styleSetFontAttr(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,Size,FaceName,Bold,Italic,Underline, Options) when is_integer(StyleNum),is_integer(Size),is_list(FaceName),is_boolean(Bold),is_boolean(Italic),is_boolean(Underline),is_list(Options) -> @@ -3948,7 +3948,7 @@ setLastKeydownProcessed(#wx_ref{type=ThisT,ref=ThisRef},Val) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsavefile">external documentation</a>. -spec saveFile(This, Filename) -> boolean() when - This::wxStyledTextCtrl(), Filename::string(). + This::wxStyledTextCtrl(), Filename::unicode:chardata(). saveFile(#wx_ref{type=ThisT,ref=ThisRef},Filename) when is_list(Filename) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3958,7 +3958,7 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef},Filename) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlloadfile">external documentation</a>. -spec loadFile(This, Filename) -> boolean() when - This::wxStyledTextCtrl(), Filename::string(). + This::wxStyledTextCtrl(), Filename::unicode:chardata(). loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename) when is_list(Filename) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -3979,7 +3979,7 @@ doDragOver(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Def) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldodroptext">external documentation</a>. -spec doDropText(This, X, Y, Data) -> boolean() when - This::wxStyledTextCtrl(), X::integer(), Y::integer(), Data::string(). + This::wxStyledTextCtrl(), X::integer(), Y::integer(), Data::unicode:chardata(). doDropText(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Data) when is_integer(X),is_integer(Y),is_list(Data) -> ?CLASS(ThisT,wxStyledTextCtrl), @@ -4079,7 +4079,7 @@ appendTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text) <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxStyledTextCtrl) -> ok. +-spec destroy(This::wxStyledTextCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxStyledTextCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxStyledTextEvent.erl b/lib/wx/src/gen/wxStyledTextEvent.erl index 9c1343ef85..1c2c79fe5d 100644 --- a/lib/wx/src/gen/wxStyledTextEvent.erl +++ b/lib/wx/src/gen/wxStyledTextEvent.erl @@ -84,7 +84,7 @@ getModificationType(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgettext">external documentation</a>. --spec getText(This) -> string() when +-spec getText(This) -> unicode:charlist() when This::wxStyledTextEvent(). getText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxStyledTextEvent), @@ -188,7 +188,7 @@ getY(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetdragtext">external documentation</a>. --spec getDragText(This) -> string() when +-spec getDragText(This) -> unicode:charlist() when This::wxStyledTextEvent(). getDragText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxStyledTextEvent), diff --git a/lib/wx/src/gen/wxSystemOptions.erl b/lib/wx/src/gen/wxSystemOptions.erl index a94b74136f..69ef70b2ef 100644 --- a/lib/wx/src/gen/wxSystemOptions.erl +++ b/lib/wx/src/gen/wxSystemOptions.erl @@ -35,8 +35,8 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxSystemOptions() :: wx:wx_object(). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionsgetoption">external documentation</a>. --spec getOption(Name) -> string() when - Name::string(). +-spec getOption(Name) -> unicode:charlist() when + Name::unicode:chardata(). getOption(Name) when is_list(Name) -> Name_UC = unicode:characters_to_binary([Name,0]), @@ -45,7 +45,7 @@ getOption(Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionsgetoptionint">external documentation</a>. -spec getOptionInt(Name) -> integer() when - Name::string(). + Name::unicode:chardata(). getOptionInt(Name) when is_list(Name) -> Name_UC = unicode:characters_to_binary([Name,0]), @@ -54,7 +54,7 @@ getOptionInt(Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionshasoption">external documentation</a>. -spec hasOption(Name) -> boolean() when - Name::string(). + Name::unicode:chardata(). hasOption(Name) when is_list(Name) -> Name_UC = unicode:characters_to_binary([Name,0]), @@ -63,7 +63,7 @@ hasOption(Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionsisfalse">external documentation</a>. -spec isFalse(Name) -> boolean() when - Name::string(). + Name::unicode:chardata(). isFalse(Name) when is_list(Name) -> Name_UC = unicode:characters_to_binary([Name,0]), @@ -72,9 +72,9 @@ isFalse(Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionssetoption">external documentation</a>. -spec setOption(Name, Value) -> ok when - Name::string(), Value::integer(); + Name::unicode:chardata(), Value::integer(); (Name, Value) -> ok when - Name::string(), Value::string(). + Name::unicode:chardata(), Value::unicode:chardata(). setOption(Name,Value) when is_list(Name),is_integer(Value) -> Name_UC = unicode:characters_to_binary([Name,0]), diff --git a/lib/wx/src/gen/wxSystemSettings.erl b/lib/wx/src/gen/wxSystemSettings.erl index fce9572ae9..a3bae5c85f 100644 --- a/lib/wx/src/gen/wxSystemSettings.erl +++ b/lib/wx/src/gen/wxSystemSettings.erl @@ -36,7 +36,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxSystemSettings() :: wx:wx_object(). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetcolour">external documentation</a>. %%<br /> Index = ?wxSYS_COLOUR_SCROLLBAR | ?wxSYS_COLOUR_BACKGROUND | ?wxSYS_COLOUR_DESKTOP | ?wxSYS_COLOUR_ACTIVECAPTION | ?wxSYS_COLOUR_INACTIVECAPTION | ?wxSYS_COLOUR_MENU | ?wxSYS_COLOUR_WINDOW | ?wxSYS_COLOUR_WINDOWFRAME | ?wxSYS_COLOUR_MENUTEXT | ?wxSYS_COLOUR_WINDOWTEXT | ?wxSYS_COLOUR_CAPTIONTEXT | ?wxSYS_COLOUR_ACTIVEBORDER | ?wxSYS_COLOUR_INACTIVEBORDER | ?wxSYS_COLOUR_APPWORKSPACE | ?wxSYS_COLOUR_HIGHLIGHT | ?wxSYS_COLOUR_HIGHLIGHTTEXT | ?wxSYS_COLOUR_BTNFACE | ?wxSYS_COLOUR_3DFACE | ?wxSYS_COLOUR_BTNSHADOW | ?wxSYS_COLOUR_3DSHADOW | ?wxSYS_COLOUR_GRAYTEXT | ?wxSYS_COLOUR_BTNTEXT | ?wxSYS_COLOUR_INACTIVECAPTIONTEXT | ?wxSYS_COLOUR_BTNHIGHLIGHT | ?wxSYS_COLOUR_BTNHILIGHT | ?wxSYS_COLOUR_3DHIGHLIGHT | ?wxSYS_COLOUR_3DHILIGHT | ?wxSYS_COLOUR_3DDKSHADOW | ?wxSYS_COLOUR_3DLIGHT | ?wxSYS_COLOUR_INFOTEXT | ?wxSYS_COLOUR_INFOBK | ?wxSYS_COLOUR_LISTBOX | ?wxSYS_COLOUR_HOTLIGHT | ?wxSYS_COLOUR_GRADIENTACTIVECAPTION | ?wxSYS_COLOUR_GRADIENTINACTIVECAPTION | ?wxSYS_COLOUR_MENUHILIGHT | ?wxSYS_COLOUR_MENUBAR | ?wxSYS_COLOUR_LISTBOXTEXT | ?wxSYS_COLOUR_MAX --spec getColour(Index) -> wx:wx_colour() when +-spec getColour(Index) -> wx:wx_colour4() when Index::wx:wx_enum(). getColour(Index) when is_integer(Index) -> diff --git a/lib/wx/src/gen/wxTextAttr.erl b/lib/wx/src/gen/wxTextAttr.erl index 1e3872421b..16bb943359 100644 --- a/lib/wx/src/gen/wxTextAttr.erl +++ b/lib/wx/src/gen/wxTextAttr.erl @@ -80,7 +80,7 @@ getAlignment(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetbackgroundcolour">external documentation</a>. --spec getBackgroundColour(This) -> wx:wx_colour() when +-spec getBackgroundColour(This) -> wx:wx_colour4() when This::wxTextAttr(). getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxTextAttr), @@ -128,7 +128,7 @@ getTabs(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgettextcolour">external documentation</a>. --spec getTextColour(This) -> wx:wx_colour() when +-spec getTextColour(This) -> wx:wx_colour4() when This::wxTextAttr(). getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxTextAttr), @@ -275,7 +275,7 @@ setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText) <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxTextAttr) -> ok. +-spec destroy(This::wxTextAttr()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxTextAttr), wxe_util:destroy(?wxTextAttr_destroy,Obj), diff --git a/lib/wx/src/gen/wxTextCtrl.erl b/lib/wx/src/gen/wxTextCtrl.erl index fa83913a6f..21ff062d5b 100644 --- a/lib/wx/src/gen/wxTextCtrl.erl +++ b/lib/wx/src/gen/wxTextCtrl.erl @@ -102,7 +102,7 @@ new(Parent,Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlwxtextctrl">external documentation</a>. -spec new(Parent, Id, [Option]) -> wxTextCtrl() when Parent::wxWindow:wxWindow(), Id::integer(), - Option :: {value, string()} + Option :: {value, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -122,7 +122,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlappendtext">external documentation</a>. -spec appendText(This, Text) -> ok when - This::wxTextCtrl(), Text::string(). + This::wxTextCtrl(), Text::unicode:chardata(). appendText(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxTextCtrl), @@ -197,7 +197,7 @@ create(This,Parent,Id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcreate">external documentation</a>. -spec create(This, Parent, Id, [Option]) -> boolean() when This::wxTextCtrl(), Parent::wxWindow:wxWindow(), Id::integer(), - Option :: {value, string()} + Option :: {value, unicode:chardata()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -275,7 +275,7 @@ getLineLength(#wx_ref{type=ThisT,ref=ThisRef},LineNo) <<ThisRef:32/?UI,LineNo:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetlinetext">external documentation</a>. --spec getLineText(This, LineNo) -> string() when +-spec getLineText(This, LineNo) -> unicode:charlist() when This::wxTextCtrl(), LineNo::integer(). getLineText(#wx_ref{type=ThisT,ref=ThisRef},LineNo) when is_integer(LineNo) -> @@ -292,7 +292,7 @@ getNumberOfLines(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetrange">external documentation</a>. --spec getRange(This, From, To) -> string() when +-spec getRange(This, From, To) -> unicode:charlist() when This::wxTextCtrl(), From::integer(), To::integer(). getRange(#wx_ref{type=ThisT,ref=ThisRef},From,To) when is_integer(From),is_integer(To) -> @@ -309,7 +309,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetstringselection">external documentation</a>. --spec getStringSelection(This) -> string() when +-spec getStringSelection(This) -> unicode:charlist() when This::wxTextCtrl(). getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxTextCtrl), @@ -327,7 +327,7 @@ getStyle(#wx_ref{type=ThisT,ref=ThisRef},Position,#wx_ref{type=StyleT,ref=StyleR <<ThisRef:32/?UI,Position:32/?UI,StyleRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetvalue">external documentation</a>. --spec getValue(This) -> string() when +-spec getValue(This) -> unicode:charlist() when This::wxTextCtrl(). getValue(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxTextCtrl), @@ -368,7 +368,7 @@ isSingleLine(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @equiv loadFile(This,File, []) -spec loadFile(This, File) -> boolean() when - This::wxTextCtrl(), File::string(). + This::wxTextCtrl(), File::unicode:chardata(). loadFile(This,File) when is_record(This, wx_ref),is_list(File) -> @@ -376,7 +376,7 @@ loadFile(This,File) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlloadfile">external documentation</a>. -spec loadFile(This, File, [Option]) -> boolean() when - This::wxTextCtrl(), File::string(), + This::wxTextCtrl(), File::unicode:chardata(), Option :: {fileType, integer()}. loadFile(#wx_ref{type=ThisT,ref=ThisRef},File, Options) when is_list(File),is_list(Options) -> @@ -433,7 +433,7 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},From,To) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlreplace">external documentation</a>. -spec replace(This, From, To, Value) -> ok when - This::wxTextCtrl(), From::integer(), To::integer(), Value::string(). + This::wxTextCtrl(), From::integer(), To::integer(), Value::unicode:chardata(). replace(#wx_ref{type=ThisT,ref=ThisRef},From,To,Value) when is_integer(From),is_integer(To),is_list(Value) -> ?CLASS(ThisT,wxTextCtrl), @@ -452,7 +452,7 @@ saveFile(This) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsavefile">external documentation</a>. -spec saveFile(This, [Option]) -> boolean() when This::wxTextCtrl(), - Option :: {file, string()} + Option :: {file, unicode:chardata()} | {fileType, integer()}. saveFile(#wx_ref{type=ThisT,ref=ThisRef}, Options) when is_list(Options) -> @@ -529,7 +529,7 @@ setStyle(#wx_ref{type=ThisT,ref=ThisRef},Start,End,#wx_ref{type=StyleT,ref=Style %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetvalue">external documentation</a>. -spec setValue(This, Value) -> ok when - This::wxTextCtrl(), Value::string(). + This::wxTextCtrl(), Value::unicode:chardata(). setValue(#wx_ref{type=ThisT,ref=ThisRef},Value) when is_list(Value) -> ?CLASS(ThisT,wxTextCtrl), @@ -556,7 +556,7 @@ undo(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlwritetext">external documentation</a>. -spec writeText(This, Text) -> ok when - This::wxTextCtrl(), Text::string(). + This::wxTextCtrl(), Text::unicode:chardata(). writeText(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxTextCtrl), @@ -574,7 +574,7 @@ xYToPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y) <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxTextCtrl) -> ok. +-spec destroy(This::wxTextCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxTextCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxTextDataObject.erl b/lib/wx/src/gen/wxTextDataObject.erl index ab4d5378e1..4ffa2de4a7 100644 --- a/lib/wx/src/gen/wxTextDataObject.erl +++ b/lib/wx/src/gen/wxTextDataObject.erl @@ -46,7 +46,7 @@ new() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectwxtextdataobject">external documentation</a>. -spec new([Option]) -> wxTextDataObject() when - Option :: {text, string()}. + Option :: {text, unicode:chardata()}. new(Options) when is_list(Options) -> MOpts = fun({text, Text}, Acc) -> Text_UC = unicode:characters_to_binary([Text,0]),[<<1:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>|Acc]; @@ -64,7 +64,7 @@ getTextLength(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectgettext">external documentation</a>. --spec getText(This) -> string() when +-spec getText(This) -> unicode:charlist() when This::wxTextDataObject(). getText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxTextDataObject), @@ -73,7 +73,7 @@ getText(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectsettext">external documentation</a>. -spec setText(This, Text) -> ok when - This::wxTextDataObject(), Text::string(). + This::wxTextDataObject(), Text::unicode:chardata(). setText(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxTextDataObject), @@ -82,7 +82,7 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Text) <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxTextDataObject) -> ok. +-spec destroy(This::wxTextDataObject()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxTextDataObject), wxe_util:destroy(?wxTextDataObject_destroy,Obj), diff --git a/lib/wx/src/gen/wxTextEntryDialog.erl b/lib/wx/src/gen/wxTextEntryDialog.erl index c26a1a57b5..78e6e32b98 100644 --- a/lib/wx/src/gen/wxTextEntryDialog.erl +++ b/lib/wx/src/gen/wxTextEntryDialog.erl @@ -88,7 +88,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -type wxTextEntryDialog() :: wx:wx_object(). %% @equiv new(Parent,Message, []) -spec new(Parent, Message) -> wxTextEntryDialog() when - Parent::wxWindow:wxWindow(), Message::string(). + Parent::wxWindow:wxWindow(), Message::unicode:chardata(). new(Parent,Message) when is_record(Parent, wx_ref),is_list(Message) -> @@ -96,9 +96,9 @@ new(Parent,Message) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextentrydialog.html#wxtextentrydialogwxtextentrydialog">external documentation</a>. -spec new(Parent, Message, [Option]) -> wxTextEntryDialog() when - Parent::wxWindow:wxWindow(), Message::string(), - Option :: {caption, string()} - | {value, string()} + Parent::wxWindow:wxWindow(), Message::unicode:chardata(), + Option :: {caption, unicode:chardata()} + | {value, unicode:chardata()} | {style, integer()} | {pos, {X::integer(), Y::integer()}}. new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options) @@ -115,7 +115,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options) <<ParentRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextentrydialog.html#wxtextentrydialoggetvalue">external documentation</a>. --spec getValue(This) -> string() when +-spec getValue(This) -> unicode:charlist() when This::wxTextEntryDialog(). getValue(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxTextEntryDialog), @@ -124,7 +124,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextentrydialog.html#wxtextentrydialogsetvalue">external documentation</a>. -spec setValue(This, Val) -> ok when - This::wxTextEntryDialog(), Val::string(). + This::wxTextEntryDialog(), Val::unicode:chardata(). setValue(#wx_ref{type=ThisT,ref=ThisRef},Val) when is_list(Val) -> ?CLASS(ThisT,wxTextEntryDialog), @@ -133,7 +133,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Val) <<ThisRef:32/?UI,(byte_size(Val_UC)):32/?UI,(Val_UC)/binary, 0:(((8- ((0+byte_size(Val_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxTextEntryDialog) -> ok. +-spec destroy(This::wxTextEntryDialog()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxTextEntryDialog), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxToggleButton.erl b/lib/wx/src/gen/wxToggleButton.erl index 23a2987a27..1d770b5ca5 100644 --- a/lib/wx/src/gen/wxToggleButton.erl +++ b/lib/wx/src/gen/wxToggleButton.erl @@ -85,7 +85,7 @@ new() -> %% @equiv new(Parent,Id,Label, []) -spec new(Parent, Id, Label) -> wxToggleButton() when - Parent::wxWindow:wxWindow(), Id::integer(), Label::string(). + Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(). new(Parent,Id,Label) when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) -> @@ -93,7 +93,7 @@ new(Parent,Id,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttonwxtogglebutton">external documentation</a>. -spec new(Parent, Id, Label, [Option]) -> wxToggleButton() when - Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), + Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -113,7 +113,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Label, Options) %% @equiv create(This,Parent,Id,Label, []) -spec create(This, Parent, Id, Label) -> boolean() when - This::wxToggleButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(). + This::wxToggleButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(). create(This,Parent,Id,Label) when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) -> @@ -121,7 +121,7 @@ create(This,Parent,Id,Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttoncreate">external documentation</a>. -spec create(This, Parent, Id, Label, [Option]) -> boolean() when - This::wxToggleButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::string(), + This::wxToggleButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(), Option :: {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} @@ -158,7 +158,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},State) <<ThisRef:32/?UI,(wxe_util:from_bool(State)):32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxToggleButton) -> ok. +-spec destroy(This::wxToggleButton()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxToggleButton), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxToolBar.erl b/lib/wx/src/gen/wxToolBar.erl index 8fc200d6ba..dd03df5d18 100644 --- a/lib/wx/src/gen/wxToolBar.erl +++ b/lib/wx/src/gen/wxToolBar.erl @@ -121,13 +121,13 @@ addTool(This,Toolid,Bitmap) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>. -spec addTool(This, Toolid, Label, Bitmap) -> wx:wx() when - This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(); + This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(); (This, Toolid, Bitmap, BmpDisabled) -> wx:wx() when This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(); (This, Toolid, Bitmap, [Option]) -> wx:wx() when This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), - Option :: {shortHelpString, string()} - | {longHelpString, string()}. + Option :: {shortHelpString, unicode:chardata()} + | {longHelpString, unicode:chardata()}. addTool(This,Toolid,Label,Bitmap) when is_record(This, wx_ref),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref) -> @@ -149,17 +149,17 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>. -spec addTool(This, Toolid, Label, Bitmap, BmpDisabled) -> wx:wx() when - This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(); + This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(); (This, Toolid, Label, Bitmap, [Option]) -> wx:wx() when - This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), - Option :: {shortHelp, string()} + This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(), + Option :: {shortHelp, unicode:chardata()} | {kind, wx:wx_enum()}; (This, Toolid, Bitmap, BmpDisabled, [Option]) -> wx:wx() when This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Option :: {toggle, boolean()} | {clientData, wx:wx()} - | {shortHelpString, string()} - | {longHelpString, string()}. + | {shortHelpString, unicode:chardata()} + | {longHelpString, unicode:chardata()}. addTool(This,Toolid,Label,Bitmap,BmpDisabled) when is_record(This, wx_ref),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref),is_record(BmpDisabled, wx_ref) -> @@ -193,10 +193,10 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe -spec addTool(This, Toolid, Bitmap, BmpDisabled, Toggle, XPos) -> wx:wx() when This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Toggle::boolean(), XPos::integer(); (This, Toolid, Label, Bitmap, BmpDisabled, [Option]) -> wx:wx() when - This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), + This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Option :: {kind, wx:wx_enum()} - | {shortHelp, string()} - | {longHelp, string()} + | {shortHelp, unicode:chardata()} + | {longHelp, unicode:chardata()} | {data, wx:wx()}. addTool(This,Toolid,Bitmap,BmpDisabled,Toggle,XPos) @@ -222,8 +222,8 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,ref=Bi This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Toggle::boolean(), XPos::integer(), Option :: {yPos, integer()} | {clientData, wx:wx()} - | {shortHelp, string()} - | {longHelp, string()}. + | {shortHelp, unicode:chardata()} + | {longHelp, unicode:chardata()}. addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRef},#wx_ref{type=BmpDisabledT,ref=BmpDisabledRef},Toggle,XPos, Options) when is_integer(Toolid),is_boolean(Toggle),is_integer(XPos),is_list(Options) -> ?CLASS(ThisT,wxToolBar), @@ -240,7 +240,7 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe %% @equiv addCheckTool(This,Toolid,Label,Bitmap, []) -spec addCheckTool(This, Toolid, Label, Bitmap) -> wx:wx() when - This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(). + This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(). addCheckTool(This,Toolid,Label,Bitmap) when is_record(This, wx_ref),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref) -> @@ -248,10 +248,10 @@ addCheckTool(This,Toolid,Label,Bitmap) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddchecktool">external documentation</a>. -spec addCheckTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx() when - This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), + This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(), Option :: {bmpDisabled, wxBitmap:wxBitmap()} - | {shortHelp, string()} - | {longHelp, string()} + | {shortHelp, unicode:chardata()} + | {longHelp, unicode:chardata()} | {data, wx:wx()}. addCheckTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,ref=BitmapRef}, Options) when is_integer(Toolid),is_list(Label),is_list(Options) -> @@ -269,7 +269,7 @@ addCheckTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,r %% @equiv addRadioTool(This,Toolid,Label,Bitmap, []) -spec addRadioTool(This, Toolid, Label, Bitmap) -> wx:wx() when - This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(). + This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(). addRadioTool(This,Toolid,Label,Bitmap) when is_record(This, wx_ref),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref) -> @@ -277,10 +277,10 @@ addRadioTool(This,Toolid,Label,Bitmap) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddradiotool">external documentation</a>. -spec addRadioTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx() when - This::wxToolBar(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), + This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(), Option :: {bmpDisabled, wxBitmap:wxBitmap()} - | {shortHelp, string()} - | {longHelp, string()} + | {shortHelp, unicode:chardata()} + | {longHelp, unicode:chardata()} | {data, wx:wx()}. addRadioTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,ref=BitmapRef}, Options) when is_integer(Toolid),is_list(Label),is_list(Options) -> @@ -384,7 +384,7 @@ getToolEnabled(#wx_ref{type=ThisT,ref=ThisRef},Toolid) <<ThisRef:32/?UI,Toolid:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoollonghelp">external documentation</a>. --spec getToolLongHelp(This, Toolid) -> string() when +-spec getToolLongHelp(This, Toolid) -> unicode:charlist() when This::wxToolBar(), Toolid::integer(). getToolLongHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid) when is_integer(Toolid) -> @@ -418,7 +418,7 @@ getToolSeparation(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolshorthelp">external documentation</a>. --spec getToolShortHelp(This, Toolid) -> string() when +-spec getToolShortHelp(This, Toolid) -> unicode:charlist() when This::wxToolBar(), Toolid::integer(). getToolShortHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid) when is_integer(Toolid) -> @@ -474,14 +474,14 @@ insertTool(This,Pos,Toolid,Bitmap) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>. -spec insertTool(This, Pos, Toolid, Label, Bitmap) -> wx:wx() when - This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(); + This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(); (This, Pos, Toolid, Bitmap, [Option]) -> wx:wx() when This::wxToolBar(), Pos::integer(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), Option :: {bmpDisabled, wxBitmap:wxBitmap()} | {toggle, boolean()} | {clientData, wx:wx()} - | {shortHelp, string()} - | {longHelp, string()}. + | {shortHelp, unicode:chardata()} + | {longHelp, unicode:chardata()}. insertTool(This,Pos,Toolid,Label,Bitmap) when is_record(This, wx_ref),is_integer(Pos),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref) -> @@ -503,11 +503,11 @@ insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,Toolid,#wx_ref{type=BitmapT,ref=B %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>. %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX -spec insertTool(This, Pos, Toolid, Label, Bitmap, [Option]) -> wx:wx() when - This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::string(), Bitmap::wxBitmap:wxBitmap(), + This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(), Option :: {bmpDisabled, wxBitmap:wxBitmap()} | {kind, wx:wx_enum()} - | {shortHelp, string()} - | {longHelp, string()} + | {shortHelp, unicode:chardata()} + | {longHelp, unicode:chardata()} | {clientData, wx:wx()}. insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,Toolid,Label,#wx_ref{type=BitmapT,ref=BitmapRef}, Options) when is_integer(Pos),is_integer(Toolid),is_list(Label),is_list(Options) -> @@ -561,7 +561,7 @@ setToolBitmapSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH}) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoollonghelp">external documentation</a>. -spec setToolLongHelp(This, Toolid, HelpString) -> ok when - This::wxToolBar(), Toolid::integer(), HelpString::string(). + This::wxToolBar(), Toolid::integer(), HelpString::unicode:chardata(). setToolLongHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid,HelpString) when is_integer(Toolid),is_list(HelpString) -> ?CLASS(ThisT,wxToolBar), @@ -580,7 +580,7 @@ setToolPacking(#wx_ref{type=ThisT,ref=ThisRef},Packing) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoolshorthelp">external documentation</a>. -spec setToolShortHelp(This, Id, HelpString) -> ok when - This::wxToolBar(), Id::integer(), HelpString::string(). + This::wxToolBar(), Id::integer(), HelpString::unicode:chardata(). setToolShortHelp(#wx_ref{type=ThisT,ref=ThisRef},Id,HelpString) when is_integer(Id),is_list(HelpString) -> ?CLASS(ThisT,wxToolBar), diff --git a/lib/wx/src/gen/wxToolTip.erl b/lib/wx/src/gen/wxToolTip.erl index c604fc4af9..e9b5510357 100644 --- a/lib/wx/src/gen/wxToolTip.erl +++ b/lib/wx/src/gen/wxToolTip.erl @@ -52,7 +52,7 @@ setDelay(Msecs) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipwxtooltip">external documentation</a>. -spec new(Tip) -> wxToolTip() when - Tip::string(). + Tip::unicode:chardata(). new(Tip) when is_list(Tip) -> Tip_UC = unicode:characters_to_binary([Tip,0]), @@ -61,7 +61,7 @@ new(Tip) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipsettip">external documentation</a>. -spec setTip(This, Tip) -> ok when - This::wxToolTip(), Tip::string(). + This::wxToolTip(), Tip::unicode:chardata(). setTip(#wx_ref{type=ThisT,ref=ThisRef},Tip) when is_list(Tip) -> ?CLASS(ThisT,wxToolTip), @@ -70,7 +70,7 @@ setTip(#wx_ref{type=ThisT,ref=ThisRef},Tip) <<ThisRef:32/?UI,(byte_size(Tip_UC)):32/?UI,(Tip_UC)/binary, 0:(((8- ((0+byte_size(Tip_UC)) band 16#7)) band 16#7))/unit:8>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipgettip">external documentation</a>. --spec getTip(This) -> string() when +-spec getTip(This) -> unicode:charlist() when This::wxToolTip(). getTip(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxToolTip), @@ -86,7 +86,7 @@ getWindow(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxToolTip) -> ok. +-spec destroy(This::wxToolTip()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxToolTip), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxToolbook.erl b/lib/wx/src/gen/wxToolbook.erl index f568a11d6a..9172f7a2d9 100644 --- a/lib/wx/src/gen/wxToolbook.erl +++ b/lib/wx/src/gen/wxToolbook.erl @@ -115,7 +115,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) %% @equiv addPage(This,Page,Text, []) -spec addPage(This, Page, Text) -> boolean() when - This::wxToolbook(), Page::wxWindow:wxWindow(), Text::string(). + This::wxToolbook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(). addPage(This,Page,Text) when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) -> @@ -123,7 +123,7 @@ addPage(This,Page,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookaddpage">external documentation</a>. -spec addPage(This, Page, Text, [Option]) -> boolean() when - This::wxToolbook(), Page::wxWindow:wxWindow(), Text::string(), + This::wxToolbook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options) @@ -263,7 +263,7 @@ getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N) <<ThisRef:32/?UI,N:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetpagetext">external documentation</a>. --spec getPageText(This, N) -> string() when +-spec getPageText(This, N) -> unicode:charlist() when This::wxToolbook(), N::integer(). getPageText(#wx_ref{type=ThisT,ref=ThisRef},N) when is_integer(N) -> @@ -291,7 +291,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY}) %% @equiv insertPage(This,N,Page,Text, []) -spec insertPage(This, N, Page, Text) -> boolean() when - This::wxToolbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(). + This::wxToolbook(), N::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(). insertPage(This,N,Page,Text) when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),is_list(Text) -> @@ -299,7 +299,7 @@ insertPage(This,N,Page,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookinsertpage">external documentation</a>. -spec insertPage(This, N, Page, Text, [Option]) -> boolean() when - This::wxToolbook(), N::integer(), Page::wxWindow:wxWindow(), Text::string(), + This::wxToolbook(), N::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Text, Options) @@ -343,7 +343,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetpagetext">external documentation</a>. -spec setPageText(This, N, StrText) -> boolean() when - This::wxToolbook(), N::integer(), StrText::string(). + This::wxToolbook(), N::integer(), StrText::unicode:chardata(). setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText) when is_integer(N),is_list(StrText) -> ?CLASS(ThisT,wxToolbook), @@ -370,7 +370,7 @@ changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N) <<ThisRef:32/?UI,N:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxToolbook) -> ok. +-spec destroy(This::wxToolbook()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxToolbook), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxTopLevelWindow.erl b/lib/wx/src/gen/wxTopLevelWindow.erl index b315429bb6..5659c0927f 100644 --- a/lib/wx/src/gen/wxTopLevelWindow.erl +++ b/lib/wx/src/gen/wxTopLevelWindow.erl @@ -96,7 +96,7 @@ getIcons(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowgettitle">external documentation</a>. --spec getTitle(This) -> string() when +-spec getTitle(This) -> unicode:charlist() when This::wxTopLevelWindow(). getTitle(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxTopLevelWindow), @@ -269,7 +269,7 @@ setShape(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowsettitle">external documentation</a>. -spec setTitle(This, Title) -> ok when - This::wxTopLevelWindow(), Title::string(). + This::wxTopLevelWindow(), Title::unicode:chardata(). setTitle(#wx_ref{type=ThisT,ref=ThisRef},Title) when is_list(Title) -> ?CLASS(ThisT,wxTopLevelWindow), diff --git a/lib/wx/src/gen/wxTreeCtrl.erl b/lib/wx/src/gen/wxTreeCtrl.erl index ba9052b5f3..fef9916fff 100644 --- a/lib/wx/src/gen/wxTreeCtrl.erl +++ b/lib/wx/src/gen/wxTreeCtrl.erl @@ -134,7 +134,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options) %% @equiv addRoot(This,Text, []) -spec addRoot(This, Text) -> integer() when - This::wxTreeCtrl(), Text::string(). + This::wxTreeCtrl(), Text::unicode:chardata(). addRoot(This,Text) when is_record(This, wx_ref),is_list(Text) -> @@ -142,7 +142,7 @@ addRoot(This,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrladdroot">external documentation</a>. -spec addRoot(This, Text, [Option]) -> integer() when - This::wxTreeCtrl(), Text::string(), + This::wxTreeCtrl(), Text::unicode:chardata(), Option :: {image, integer()} | {selectedImage, integer()} | {data, term()}. @@ -160,7 +160,7 @@ addRoot(#wx_ref{type=ThisT,ref=ThisRef},Text, Options) %% @equiv appendItem(This,Parent,Text, []) -spec appendItem(This, Parent, Text) -> integer() when - This::wxTreeCtrl(), Parent::integer(), Text::string(). + This::wxTreeCtrl(), Parent::integer(), Text::unicode:chardata(). appendItem(This,Parent,Text) when is_record(This, wx_ref),is_integer(Parent),is_list(Text) -> @@ -168,7 +168,7 @@ appendItem(This,Parent,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlappenditem">external documentation</a>. -spec appendItem(This, Parent, Text, [Option]) -> integer() when - This::wxTreeCtrl(), Parent::integer(), Text::string(), + This::wxTreeCtrl(), Parent::integer(), Text::unicode:chardata(), Option :: {image, integer()} | {selectedImage, integer()} | {data, term()}. @@ -406,7 +406,7 @@ getIndent(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitembackgroundcolour">external documentation</a>. --spec getItemBackgroundColour(This, Item) -> wx:wx_colour() when +-spec getItemBackgroundColour(This, Item) -> wx:wx_colour4() when This::wxTreeCtrl(), Item::integer(). getItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item) when is_integer(Item) -> @@ -456,7 +456,7 @@ getItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item, Options) <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemtext">external documentation</a>. --spec getItemText(This, Item) -> string() when +-spec getItemText(This, Item) -> unicode:charlist() when This::wxTreeCtrl(), Item::integer(). getItemText(#wx_ref{type=ThisT,ref=ThisRef},Item) when is_integer(Item) -> @@ -465,7 +465,7 @@ getItemText(#wx_ref{type=ThisT,ref=ThisRef},Item) <<ThisRef:32/?UI,0:32,Item:64/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemtextcolour">external documentation</a>. --spec getItemTextColour(This, Item) -> wx:wx_colour() when +-spec getItemTextColour(This, Item) -> wx:wx_colour4() when This::wxTreeCtrl(), Item::integer(). getItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item) when is_integer(Item) -> @@ -571,7 +571,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY}) %% @equiv insertItem(This,Parent,Pos,Text, []) -spec insertItem(This, Parent, Pos, Text) -> integer() when - This::wxTreeCtrl(), Parent::integer(), Pos::integer(), Text::string(). + This::wxTreeCtrl(), Parent::integer(), Pos::integer(), Text::unicode:chardata(). insertItem(This,Parent,Pos,Text) when is_record(This, wx_ref),is_integer(Parent),is_integer(Pos),is_list(Text) -> @@ -579,7 +579,7 @@ insertItem(This,Parent,Pos,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlinsertitem">external documentation</a>. -spec insertItem(This, Parent, Pos, Text, [Option]) -> integer() when - This::wxTreeCtrl(), Parent::integer(), Pos::integer(), Text::string(), + This::wxTreeCtrl(), Parent::integer(), Pos::integer(), Text::unicode:chardata(), Option :: {image, integer()} | {selImage, integer()} | {data, term()}. @@ -642,7 +642,7 @@ itemHasChildren(#wx_ref{type=ThisT,ref=ThisRef},Item) %% @equiv prependItem(This,Parent,Text, []) -spec prependItem(This, Parent, Text) -> integer() when - This::wxTreeCtrl(), Parent::integer(), Text::string(). + This::wxTreeCtrl(), Parent::integer(), Text::unicode:chardata(). prependItem(This,Parent,Text) when is_record(This, wx_ref),is_integer(Parent),is_list(Text) -> @@ -650,7 +650,7 @@ prependItem(This,Parent,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlprependitem">external documentation</a>. -spec prependItem(This, Parent, Text, [Option]) -> integer() when - This::wxTreeCtrl(), Parent::integer(), Text::string(), + This::wxTreeCtrl(), Parent::integer(), Text::unicode:chardata(), Option :: {image, integer()} | {selectedImage, integer()} | {data, term()}. @@ -832,7 +832,7 @@ setItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Image, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemtext">external documentation</a>. -spec setItemText(This, Item, Text) -> ok when - This::wxTreeCtrl(), Item::integer(), Text::string(). + This::wxTreeCtrl(), Item::integer(), Text::unicode:chardata(). setItemText(#wx_ref{type=ThisT,ref=ThisRef},Item,Text) when is_integer(Item),is_list(Text) -> ?CLASS(ThisT,wxTreeCtrl), @@ -920,7 +920,7 @@ unselectItem(#wx_ref{type=ThisT,ref=ThisRef},Item) <<ThisRef:32/?UI,0:32,Item:64/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxTreeCtrl) -> ok. +-spec destroy(This::wxTreeCtrl()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxTreeCtrl), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxTreeEvent.erl b/lib/wx/src/gen/wxTreeEvent.erl index 8c91d73dbd..d042fb93e5 100644 --- a/lib/wx/src/gen/wxTreeEvent.erl +++ b/lib/wx/src/gen/wxTreeEvent.erl @@ -75,7 +75,7 @@ getKeyEvent(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetlabel">external documentation</a>. --spec getLabel(This) -> string() when +-spec getLabel(This) -> unicode:charlist() when This::wxTreeEvent(). getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxTreeEvent), @@ -108,7 +108,7 @@ isEditCancelled(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventsettooltip">external documentation</a>. -spec setToolTip(This, ToolTip) -> ok when - This::wxTreeEvent(), ToolTip::string(). + This::wxTreeEvent(), ToolTip::unicode:chardata(). setToolTip(#wx_ref{type=ThisT,ref=ThisRef},ToolTip) when is_list(ToolTip) -> ?CLASS(ThisT,wxTreeEvent), diff --git a/lib/wx/src/gen/wxTreebook.erl b/lib/wx/src/gen/wxTreebook.erl index 945cfb62e1..5d08c12cce 100644 --- a/lib/wx/src/gen/wxTreebook.erl +++ b/lib/wx/src/gen/wxTreebook.erl @@ -116,7 +116,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) %% @equiv addPage(This,Page,Text, []) -spec addPage(This, Page, Text) -> boolean() when - This::wxTreebook(), Page::wxWindow:wxWindow(), Text::string(). + This::wxTreebook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(). addPage(This,Page,Text) when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) -> @@ -124,7 +124,7 @@ addPage(This,Page,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookaddpage">external documentation</a>. -spec addPage(This, Page, Text, [Option]) -> boolean() when - This::wxTreebook(), Page::wxWindow:wxWindow(), Text::string(), + This::wxTreebook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. addPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageT,ref=PageRef},Text, Options) @@ -264,7 +264,7 @@ getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N) <<ThisRef:32/?UI,N:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetpagetext">external documentation</a>. --spec getPageText(This, N) -> string() when +-spec getPageText(This, N) -> unicode:charlist() when This::wxTreebook(), N::integer(). getPageText(#wx_ref{type=ThisT,ref=ThisRef},N) when is_integer(N) -> @@ -322,7 +322,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY}) %% @equiv insertPage(This,Pos,Page,Text, []) -spec insertPage(This, Pos, Page, Text) -> boolean() when - This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string(). + This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(). insertPage(This,Pos,Page,Text) when is_record(This, wx_ref),is_integer(Pos),is_record(Page, wx_ref),is_list(Text) -> @@ -330,7 +330,7 @@ insertPage(This,Pos,Page,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookinsertpage">external documentation</a>. -spec insertPage(This, Pos, Page, Text, [Option]) -> boolean() when - This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string(), + This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. insertPage(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=PageT,ref=PageRef},Text, Options) @@ -347,7 +347,7 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=PageT,ref=PageRef},T %% @equiv insertSubPage(This,Pos,Page,Text, []) -spec insertSubPage(This, Pos, Page, Text) -> boolean() when - This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string(). + This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(). insertSubPage(This,Pos,Page,Text) when is_record(This, wx_ref),is_integer(Pos),is_record(Page, wx_ref),is_list(Text) -> @@ -355,7 +355,7 @@ insertSubPage(This,Pos,Page,Text) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookinsertsubpage">external documentation</a>. -spec insertSubPage(This, Pos, Page, Text, [Option]) -> boolean() when - This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::string(), + This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(), Option :: {bSelect, boolean()} | {imageId, integer()}. insertSubPage(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=PageT,ref=PageRef},Text, Options) @@ -399,7 +399,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetpagetext">external documentation</a>. -spec setPageText(This, N, StrText) -> boolean() when - This::wxTreebook(), N::integer(), StrText::string(). + This::wxTreebook(), N::integer(), StrText::unicode:chardata(). setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText) when is_integer(N),is_list(StrText) -> ?CLASS(ThisT,wxTreebook), @@ -426,7 +426,7 @@ changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N) <<ThisRef:32/?UI,N:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxTreebook) -> ok. +-spec destroy(This::wxTreebook()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxTreebook), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxUpdateUIEvent.erl b/lib/wx/src/gen/wxUpdateUIEvent.erl index 26cf81f72d..f6d46611ab 100644 --- a/lib/wx/src/gen/wxUpdateUIEvent.erl +++ b/lib/wx/src/gen/wxUpdateUIEvent.erl @@ -141,7 +141,7 @@ getSetText(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgettext">external documentation</a>. --spec getText(This) -> string() when +-spec getText(This) -> unicode:charlist() when This::wxUpdateUIEvent(). getText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxUpdateUIEvent), @@ -178,7 +178,7 @@ setMode(Mode) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventsettext">external documentation</a>. -spec setText(This, Text) -> ok when - This::wxUpdateUIEvent(), Text::string(). + This::wxUpdateUIEvent(), Text::unicode:chardata(). setText(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxUpdateUIEvent), diff --git a/lib/wx/src/gen/wxWindow.erl b/lib/wx/src/gen/wxWindow.erl index 9c4d3596fe..ecae29ea5f 100644 --- a/lib/wx/src/gen/wxWindow.erl +++ b/lib/wx/src/gen/wxWindow.erl @@ -327,7 +327,7 @@ findFocus() -> -spec findWindow(This, Winid) -> wxWindow() when This::wxWindow(), Winid::integer(); (This, Name) -> wxWindow() when - This::wxWindow(), Name::string(). + This::wxWindow(), Name::unicode:chardata(). findWindow(#wx_ref{type=ThisT,ref=ThisRef},Winid) when is_integer(Winid) -> ?CLASS(ThisT,wxWindow), @@ -362,7 +362,7 @@ findWindowById(Winid, Options) %% @equiv findWindowByName(Name, []) -spec findWindowByName(Name) -> wxWindow() when - Name::string(). + Name::unicode:chardata(). findWindowByName(Name) when is_list(Name) -> @@ -370,7 +370,7 @@ findWindowByName(Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindwindowbyname">external documentation</a>. -spec findWindowByName(Name, [Option]) -> wxWindow() when - Name::string(), + Name::unicode:chardata(), Option :: {parent, wxWindow()}. findWindowByName(Name, Options) when is_list(Name),is_list(Options) -> @@ -383,7 +383,7 @@ findWindowByName(Name, Options) %% @equiv findWindowByLabel(Label, []) -spec findWindowByLabel(Label) -> wxWindow() when - Label::string(). + Label::unicode:chardata(). findWindowByLabel(Label) when is_list(Label) -> @@ -391,7 +391,7 @@ findWindowByLabel(Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindwindowbylabel">external documentation</a>. -spec findWindowByLabel(Label, [Option]) -> wxWindow() when - Label::string(), + Label::unicode:chardata(), Option :: {parent, wxWindow()}. findWindowByLabel(Label, Options) when is_list(Label),is_list(Options) -> @@ -435,7 +435,7 @@ getAcceleratorTable(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetbackgroundcolour">external documentation</a>. --spec getBackgroundColour(This) -> wx:wx_colour() when +-spec getBackgroundColour(This) -> wx:wx_colour4() when This::wxWindow(). getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxWindow), @@ -554,7 +554,7 @@ getFont(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetforegroundcolour">external documentation</a>. --spec getForegroundColour(This) -> wx:wx_colour() when +-spec getForegroundColour(This) -> wx:wx_colour4() when This::wxWindow(). getForegroundColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxWindow), @@ -578,7 +578,7 @@ getHandle(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgethelptext">external documentation</a>. --spec getHelpText(This) -> string() when +-spec getHelpText(This) -> unicode:charlist() when This::wxWindow(). getHelpText(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxWindow), @@ -594,7 +594,7 @@ getId(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetlabel">external documentation</a>. --spec getLabel(This) -> string() when +-spec getLabel(This) -> unicode:charlist() when This::wxWindow(). getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxWindow), @@ -618,7 +618,7 @@ getMinSize(#wx_ref{type=ThisT,ref=ThisRef}) -> <<ThisRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetname">external documentation</a>. --spec getName(This) -> string() when +-spec getName(This) -> unicode:charlist() when This::wxWindow(). getName(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxWindow), @@ -711,7 +711,7 @@ getSizer(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @equiv getTextExtent(This,String, []) -spec getTextExtent(This, String) -> Result when Result ::{X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()}, - This::wxWindow(), String::string(). + This::wxWindow(), String::unicode:chardata(). getTextExtent(This,String) when is_record(This, wx_ref),is_list(String) -> @@ -720,7 +720,7 @@ getTextExtent(This,String) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgettextextent">external documentation</a>. -spec getTextExtent(This, String, [Option]) -> Result when Result :: {X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()}, - This::wxWindow(), String::string(), + This::wxWindow(), String::unicode:chardata(), Option :: {theFont, wxFont:wxFont()}. getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options) when is_list(String),is_list(Options) -> @@ -1419,7 +1419,7 @@ setForegroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsethelptext">external documentation</a>. -spec setHelpText(This, Text) -> ok when - This::wxWindow(), Text::string(). + This::wxWindow(), Text::unicode:chardata(). setHelpText(#wx_ref{type=ThisT,ref=ThisRef},Text) when is_list(Text) -> ?CLASS(ThisT,wxWindow), @@ -1438,7 +1438,7 @@ setId(#wx_ref{type=ThisT,ref=ThisRef},Winid) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetlabel">external documentation</a>. -spec setLabel(This, Label) -> ok when - This::wxWindow(), Label::string(). + This::wxWindow(), Label::unicode:chardata(). setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label) when is_list(Label) -> ?CLASS(ThisT,wxWindow), @@ -1448,7 +1448,7 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetname">external documentation</a>. -spec setName(This, Name) -> ok when - This::wxWindow(), Name::string(). + This::wxWindow(), Name::unicode:chardata(). setName(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxWindow), @@ -1666,7 +1666,7 @@ setThemeEnabled(#wx_ref{type=ThisT,ref=ThisRef},EnableTheme) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsettooltip">external documentation</a>. -spec setToolTip(This, Tip) -> ok when - This::wxWindow(), Tip::string(); + This::wxWindow(), Tip::unicode:chardata(); (This, Tip) -> ok when This::wxWindow(), Tip::wxToolTip:wxToolTip(). setToolTip(#wx_ref{type=ThisT,ref=ThisRef},Tip) @@ -1869,7 +1869,7 @@ warpPointer(#wx_ref{type=ThisT,ref=ThisRef},X,Y) <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxWindow) -> ok. +-spec destroy(This::wxWindow()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxWindow), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxWindowDC.erl b/lib/wx/src/gen/wxWindowDC.erl index 9501cec539..babb3c0e90 100644 --- a/lib/wx/src/gen/wxWindowDC.erl +++ b/lib/wx/src/gen/wxWindowDC.erl @@ -73,7 +73,7 @@ new(#wx_ref{type=WinT,ref=WinRef}) -> <<WinRef:32/?UI>>). %% @doc Destroys this object, do not use object again --spec destroy(This::wxWindowDC) -> ok. +-spec destroy(This::wxWindowDC()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxWindowDC), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wxXmlResource.erl b/lib/wx/src/gen/wxXmlResource.erl index c18f6ce051..aa0cffb5a8 100644 --- a/lib/wx/src/gen/wxXmlResource.erl +++ b/lib/wx/src/gen/wxXmlResource.erl @@ -48,7 +48,7 @@ new() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcewxxmlresource">external documentation</a>. -spec new([Option]) -> wxXmlResource() when Option :: {flags, integer()} - | {domain, string()}. + | {domain, unicode:chardata()}. new(Options) when is_list(Options) -> MOpts = fun({flags, Flags}, Acc) -> [<<1:32/?UI,Flags:32/?UI>>|Acc]; @@ -60,9 +60,9 @@ new(Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcewxxmlresource">external documentation</a>. -spec new(Filemask, [Option]) -> wxXmlResource() when - Filemask::string(), + Filemask::unicode:chardata(), Option :: {flags, integer()} - | {domain, string()}. + | {domain, unicode:chardata()}. new(Filemask, Options) when is_list(Filemask),is_list(Options) -> Filemask_UC = unicode:characters_to_binary([Filemask,0]), @@ -75,7 +75,7 @@ new(Filemask, Options) %% @equiv attachUnknownControl(This,Name,Control, []) -spec attachUnknownControl(This, Name, Control) -> boolean() when - This::wxXmlResource(), Name::string(), Control::wxWindow:wxWindow(). + This::wxXmlResource(), Name::unicode:chardata(), Control::wxWindow:wxWindow(). attachUnknownControl(This,Name,Control) when is_record(This, wx_ref),is_list(Name),is_record(Control, wx_ref) -> @@ -83,7 +83,7 @@ attachUnknownControl(This,Name,Control) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceattachunknowncontrol">external documentation</a>. -spec attachUnknownControl(This, Name, Control, [Option]) -> boolean() when - This::wxXmlResource(), Name::string(), Control::wxWindow:wxWindow(), + This::wxXmlResource(), Name::unicode:chardata(), Control::wxWindow:wxWindow(), Option :: {parent, wxWindow:wxWindow()}. attachUnknownControl(#wx_ref{type=ThisT,ref=ThisRef},Name,#wx_ref{type=ControlT,ref=ControlRef}, Options) when is_list(Name),is_list(Options) -> @@ -137,7 +137,7 @@ getVersion(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @equiv getXRCID(Str_id, []) -spec getXRCID(Str_id) -> integer() when - Str_id::[string()]. + Str_id::[unicode:chardata()]. getXRCID(Str_id) when is_list(Str_id) -> @@ -145,7 +145,7 @@ getXRCID(Str_id) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcegetxrcid">external documentation</a>. -spec getXRCID(Str_id, [Option]) -> integer() when - Str_id::[string()], + Str_id::[unicode:chardata()], Option :: {value_if_not_found, integer()}. getXRCID(Str_id, Options) when is_list(Str_id),is_list(Options) -> @@ -166,7 +166,7 @@ initAllHandlers(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceload">external documentation</a>. -spec load(This, Filemask) -> boolean() when - This::wxXmlResource(), Filemask::string(). + This::wxXmlResource(), Filemask::unicode:chardata(). load(#wx_ref{type=ThisT,ref=ThisRef},Filemask) when is_list(Filemask) -> ?CLASS(ThisT,wxXmlResource), @@ -176,7 +176,7 @@ load(#wx_ref{type=ThisT,ref=ThisRef},Filemask) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadbitmap">external documentation</a>. -spec loadBitmap(This, Name) -> wxBitmap:wxBitmap() when - This::wxXmlResource(), Name::string(). + This::wxXmlResource(), Name::unicode:chardata(). loadBitmap(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -186,7 +186,7 @@ loadBitmap(#wx_ref{type=ThisT,ref=ThisRef},Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloaddialog">external documentation</a>. -spec loadDialog(This, Parent, Name) -> wxDialog:wxDialog() when - This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string(). + This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::unicode:chardata(). loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -197,7 +197,7 @@ loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},N %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloaddialog">external documentation</a>. -spec loadDialog(This, Dlg, Parent, Name) -> boolean() when - This::wxXmlResource(), Dlg::wxDialog:wxDialog(), Parent::wxWindow:wxWindow(), Name::string(). + This::wxXmlResource(), Dlg::wxDialog:wxDialog(), Parent::wxWindow:wxWindow(), Name::unicode:chardata(). loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DlgT,ref=DlgRef},#wx_ref{type=ParentT,ref=ParentRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -209,7 +209,7 @@ loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DlgT,ref=DlgRef},#wx_ref %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadframe">external documentation</a>. -spec loadFrame(This, Parent, Name) -> wxFrame:wxFrame() when - This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string(). + This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::unicode:chardata(). loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -220,7 +220,7 @@ loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Na %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadframe">external documentation</a>. -spec loadFrame(This, Frame, Parent, Name) -> boolean() when - This::wxXmlResource(), Frame::wxFrame:wxFrame(), Parent::wxWindow:wxWindow(), Name::string(). + This::wxXmlResource(), Frame::wxFrame:wxFrame(), Parent::wxWindow:wxWindow(), Name::unicode:chardata(). loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef},#wx_ref{type=ParentT,ref=ParentRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -232,7 +232,7 @@ loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef},#wx_ %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadicon">external documentation</a>. -spec loadIcon(This, Name) -> wxIcon:wxIcon() when - This::wxXmlResource(), Name::string(). + This::wxXmlResource(), Name::unicode:chardata(). loadIcon(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -242,7 +242,7 @@ loadIcon(#wx_ref{type=ThisT,ref=ThisRef},Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadmenu">external documentation</a>. -spec loadMenu(This, Name) -> wxMenu:wxMenu() when - This::wxXmlResource(), Name::string(). + This::wxXmlResource(), Name::unicode:chardata(). loadMenu(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -252,7 +252,7 @@ loadMenu(#wx_ref{type=ThisT,ref=ThisRef},Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadmenubar">external documentation</a>. -spec loadMenuBar(This, Name) -> wxMenuBar:wxMenuBar() when - This::wxXmlResource(), Name::string(). + This::wxXmlResource(), Name::unicode:chardata(). loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -262,7 +262,7 @@ loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},Name) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadmenubar">external documentation</a>. -spec loadMenuBar(This, Parent, Name) -> wxMenuBar:wxMenuBar() when - This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string(). + This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::unicode:chardata(). loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -273,7 +273,7 @@ loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadpanel">external documentation</a>. -spec loadPanel(This, Parent, Name) -> wxPanel:wxPanel() when - This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string(). + This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::unicode:chardata(). loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -284,7 +284,7 @@ loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Na %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadpanel">external documentation</a>. -spec loadPanel(This, Panel, Parent, Name) -> boolean() when - This::wxXmlResource(), Panel::wxPanel:wxPanel(), Parent::wxWindow:wxWindow(), Name::string(). + This::wxXmlResource(), Panel::wxPanel:wxPanel(), Parent::wxWindow:wxWindow(), Name::unicode:chardata(). loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PanelT,ref=PanelRef},#wx_ref{type=ParentT,ref=ParentRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -296,7 +296,7 @@ loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PanelT,ref=PanelRef},#wx_ %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadtoolbar">external documentation</a>. -spec loadToolBar(This, Parent, Name) -> wxToolBar:wxToolBar() when - This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::string(). + This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::unicode:chardata(). loadToolBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name) when is_list(Name) -> ?CLASS(ThisT,wxXmlResource), @@ -324,7 +324,7 @@ setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceunload">external documentation</a>. -spec unload(This, Filename) -> boolean() when - This::wxXmlResource(), Filename::string(). + This::wxXmlResource(), Filename::unicode:chardata(). unload(#wx_ref{type=ThisT,ref=ThisRef},Filename) when is_list(Filename) -> ?CLASS(ThisT,wxXmlResource), @@ -352,7 +352,7 @@ xrcctrl(Window = #wx_ref{}, Name, Type) when is_list(Name), is_atom(Type) -> wx:typeCast(Res, Type). %% @doc Destroys this object, do not use object again --spec destroy(This::wxXmlResource) -> ok. +-spec destroy(This::wxXmlResource()) -> ok. destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxXmlResource), wxe_util:destroy(?DESTROY_OBJECT,Obj), diff --git a/lib/wx/src/gen/wx_misc.erl b/lib/wx/src/gen/wx_misc.erl index 81dd16c0c4..a2a39bdae7 100644 --- a/lib/wx/src/gen/wx_misc.erl +++ b/lib/wx/src/gen/wx_misc.erl @@ -67,7 +67,7 @@ bell() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxfindmenuitemid">external documentation</a>. -spec findMenuItemId(Frame, MenuString, ItemString) -> integer() when - Frame::wxFrame:wxFrame(), MenuString::string(), ItemString::string(). + Frame::wxFrame:wxFrame(), MenuString::unicode:chardata(), ItemString::unicode:chardata(). findMenuItemId(#wx_ref{type=FrameT,ref=FrameRef},MenuString,ItemString) when is_list(MenuString),is_list(ItemString) -> ?CLASS(FrameT,wxFrame), @@ -138,7 +138,7 @@ shell() -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxshell">external documentation</a>. -spec shell([Option]) -> boolean() when - Option :: {command, string()}. + Option :: {command, unicode:chardata()}. shell(Options) when is_list(Options) -> MOpts = fun({command, Command}, Acc) -> Command_UC = unicode:characters_to_binary([Command,0]),[<<1:32/?UI,(byte_size(Command_UC)):32/?UI,(Command_UC)/binary, 0:(((8- ((0+byte_size(Command_UC)) band 16#7)) band 16#7))/unit:8>>|Acc]; @@ -149,7 +149,7 @@ shell(Options) %% @equiv launchDefaultBrowser(Url, []) -spec launchDefaultBrowser(Url) -> boolean() when - Url::string(). + Url::unicode:chardata(). launchDefaultBrowser(Url) when is_list(Url) -> @@ -157,7 +157,7 @@ launchDefaultBrowser(Url) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxlaunchdefaultbrowser">external documentation</a>. -spec launchDefaultBrowser(Url, [Option]) -> boolean() when - Url::string(), + Url::unicode:chardata(), Option :: {flags, integer()}. launchDefaultBrowser(Url, Options) when is_list(Url),is_list(Options) -> @@ -169,19 +169,19 @@ launchDefaultBrowser(Url, Options) <<(byte_size(Url_UC)):32/?UI,(Url_UC)/binary, 0:(((8- ((4+byte_size(Url_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetemailaddress">external documentation</a>. --spec getEmailAddress() -> string(). +-spec getEmailAddress() -> unicode:charlist(). getEmailAddress() -> wxe_util:call(?utils_wxGetEmailAddress, <<>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetuserid">external documentation</a>. --spec getUserId() -> string(). +-spec getUserId() -> unicode:charlist(). getUserId() -> wxe_util:call(?utils_wxGetUserId, <<>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgethomedir">external documentation</a>. --spec getHomeDir() -> string(). +-spec getHomeDir() -> unicode:charlist(). getHomeDir() -> wxe_util:call(?utils_wxGetHomeDir, <<>>). @@ -207,7 +207,7 @@ getCurrentId() -> <<>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetosdescription">external documentation</a>. --spec getOsDescription() -> string(). +-spec getOsDescription() -> unicode:charlist(). getOsDescription() -> wxe_util:call(?utils_wxGetOsDescription, <<>>). diff --git a/lib/wx/src/wx.erl b/lib/wx/src/wx.erl index ecdc6e2647..32e9f5da3f 100644 --- a/lib/wx/src/wx.erl +++ b/lib/wx/src/wx.erl @@ -49,7 +49,7 @@ %% %% The following classes are implemented directly as erlang types: <br /> %% wxPoint={x,y},wxSize={w,h},wxRect={x,y,w,h},wxColour={r,g,b [,a]}, -%% wxString={@link //stdlib/unicode:charlist()}, +%% wxString={@link //stdlib/unicode:chardata()}, %% wxGBPosition={r,c},wxGBSpan={rs,cs},wxGridCellCoords={r,c}. %% %% wxWidgets uses a process specific environment, which is created by @@ -75,13 +75,16 @@ -include("wxe.hrl"). -include("../include/wx.hrl"). --opaque wx_object() :: tuple(). %% Opaque object reference --opaque wx_env() :: tuple(). %% Opaque process environment --opaque wx_memory() :: tuple(). %% Opaque memory reference --type wx_colour() :: {R::byte(),G::byte(),B::byte()} | - {R::byte(),G::byte(),B::byte(), A::byte()}. %% Always RGBA as return values +-opaque wx_object() :: #wx_ref{}. %% Opaque object reference +-opaque wx_env() :: #wx_env{}. %% Opaque process environment +-opaque wx_memory() :: binary() | #wx_mem{}. %% Opaque memory reference + +-type wx_colour4() :: {R::byte(),G::byte(),B::byte(), A::byte()}. +-type wx_colour() :: {R::byte(),G::byte(),B::byte()} | wx_colour4(). + -type wx_datetime() :: {{Year::integer(),Month::integer(),Day::integer()}, {Hour::integer(),Minute::integer(),Second::integer()}}. %% In Local Timezone + -type wx_mouseState() :: #wxMouseState{}. %% See #wxMouseState{} defined in wx.hrl -type wx_enum() :: integer(). %% Constant defined in wx.hrl -type wx_wxHtmlLinkInfo() :: #wxHtmlLinkInfo{}. @@ -269,11 +272,11 @@ release_memory(Bin) when is_binary(Bin) -> wxe_util:send_bin(Bin), ok = wxe_util:cast(?WXE_BIN_DECR, <<>>). -%% @doc Sets debug level. If debug level is verbose or trace -%% each call is printed on console. If Level is driver each allocated +%% @doc Sets debug level. If debug level is 'verbose' or 'trace' +%% each call is printed on console. If Level is 'driver' each allocated %% object and deletion is printed on the console. -spec debug(Level | [Level]) -> ok - when Level :: none | verbose | trace | driver. + when Level :: none | verbose | trace | driver | integer(). debug(none) -> debug(0); debug(verbose) -> debug(1); |