From: John L. <jr...@us...> - 2007-06-13 04:15:59
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9645/wxLua/docs Modified Files: wxluaref.html Log Message: Remove class member functions that are duplicates of their baseclass functions Fix wxClassInfo is NOT a wxObject Add more capability to bindings.wx.lua Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxluaref.html 11 Jun 2007 03:57:59 -0000 1.21 --- wxluaref.html 13 Jun 2007 04:15:22 -0000 1.22 *************** *** 952,956 **** <a href="#wxFrame">wxFrame</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& title, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const <a href="#wxString">wxString</a>& name = "wxFrame")<br> <br> ! void Centre(int direction = wxBOTH)<br> bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& title, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const <a href="#wxString">wxString</a>& name = "wxFrame")<br> virtual <a href="#wxStatusBar">wxStatusBar</a>* CreateStatusBar(int number = 1, long style = 0, wxWindowID id = wxID_ANY, const <a href="#wxString">wxString</a>& name = "wxStatusBar")<br> --- 952,956 ---- <a href="#wxFrame">wxFrame</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& title, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const <a href="#wxString">wxString</a>& name = "wxFrame")<br> <br> ! // void Centre(int direction = wxBOTH) - see <a href="#wxWindow">wxWindow</a><br> bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& title, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const <a href="#wxString">wxString</a>& name = "wxFrame")<br> virtual <a href="#wxStatusBar">wxStatusBar</a>* CreateStatusBar(int number = 1, long style = 0, wxWindowID id = wxID_ANY, const <a href="#wxString">wxString</a>& name = "wxStatusBar")<br> *************** *** 2246,2250 **** //void RefreshItems(long itemFrom, long itemTo)<br> bool ScrollList(int dx, int dy)<br> ! void SetBackgroundColour(const <a href="#wxColour">wxColour</a>& col)<br> bool SetColumn(int col, <a href="#wxListItem">wxListItem</a>& item)<br> bool SetColumnWidth(int col, int width)<br> --- 2246,2250 ---- //void RefreshItems(long itemFrom, long itemTo)<br> bool ScrollList(int dx, int dy)<br> ! //void SetBackgroundColour(const <a href="#wxColour">wxColour</a>& col) - see <a href="#wxWindow">wxWindow</a><br> bool SetColumn(int col, <a href="#wxListItem">wxListItem</a>& item)<br> bool SetColumnWidth(int col, int width)<br> *************** *** 2263,2267 **** void SetSingleStyle(long style, const bool add = true)<br> void SetTextColour(const <a href="#wxColour">wxColour</a>& col)<br> ! void SetWindowStyleFlag(long style)<br> <br> <br> --- 2263,2267 ---- void SetSingleStyle(long style, const bool add = true)<br> void SetTextColour(const <a href="#wxColour">wxColour</a>& col)<br> ! //void SetWindowStyleFlag(long style) - see <a href="#wxWindow">wxWindow</a><br> <br> <br> *************** *** 2422,2430 **** <a href="#wxRadioBox">wxRadioBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& point = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxRadioBox")<br> <br> ! // these are marked deprecated in 2.6, use wxControl::Get/SetLabel/String<br> ! //<a href="#wxString">wxString</a> GetLabel() const<br> ! //void SetLabel(const <a href="#wxString">wxString</a>& label)<br> ! //<a href="#wxString">wxString</a> GetLabel(int n) const<br> ! //void SetLabel(int n, const <a href="#wxString">wxString</a>& label)<br> <br> bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& point = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxRadioBox")<br> --- 2422,2430 ---- <a href="#wxRadioBox">wxRadioBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& point = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxRadioBox")<br> <br> ! // these are marked deprecated in 2.6, use wxWindow::Get/SetLabel and Get/SetString below<br> ! // <a href="#wxString">wxString</a> GetLabel() const - see <a href="#wxWindow">wxWindow</a><br> ! // void SetLabel(const <a href="#wxString">wxString</a>& label) - see <a href="#wxWindow">wxWindow</a><br> ! // <a href="#wxString">wxString</a> GetLabel(int n) const<br> ! // void SetLabel(int n, const <a href="#wxString">wxString</a>& label)<br> <br> bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& point = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxRadioBox")<br> *************** *** 2912,2916 **** void SetItemTextColour(const <a href="#wxTreeItemId">wxTreeItemId</a>& item, const <a href="#wxColour">wxColour</a>& col)<br> void SetStateImageList(<a href="#wxImageList">wxImageList</a>* imageList)<br> ! void SetWindowStyle(long styles)<br> void SortChildren(const <a href="#wxTreeItemId">wxTreeItemId</a>& item)<br> void Toggle(const <a href="#wxTreeItemId">wxTreeItemId</a>& item)<br> --- 2912,2916 ---- void SetItemTextColour(const <a href="#wxTreeItemId">wxTreeItemId</a>& item, const <a href="#wxColour">wxColour</a>& col)<br> void SetStateImageList(<a href="#wxImageList">wxImageList</a>* imageList)<br> ! // void SetWindowStyle(long styles) - see <a href="#wxWindow">wxWindow</a><br> void SortChildren(const <a href="#wxTreeItemId">wxTreeItemId</a>& item)<br> void Toggle(const <a href="#wxTreeItemId">wxTreeItemId</a>& item)<br> *************** *** 3149,3152 **** --- 3149,3153 ---- <a href="#wxObjectRefData">wxObjectRefData</a>* GetRefData() const<br> bool IsKindOf(<a href="#wxClassInfo">wxClassInfo</a> *info)<br> + bool IsSameAs(const <a href="#wxObject">wxObject</a>& o) const<br> void Ref(const <a href="#wxObject">wxObject</a>& clone)<br> void SetRefData(<a href="#wxObjectRefData">wxObjectRefData</a>* data)<br> *************** *** 3167,3171 **** <i>%include</i> "wx/object.h"<br> <br> ! <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <b><a name="wxClassInfo">wxClassInfo</a></b>, <a href="#wxObject">wxObject</a></font></font><blockquote> <font color=#CC3300> // <i>%override</i> <a href="#wxClassInfo">wxClassInfo</a>() constructor creates an instance using wxClassInfo::FindClass</font><br> <a href="#wxClassInfo">wxClassInfo</a>(const <a href="#wxString">wxString</a> &name)<br> --- 3168,3172 ---- <i>%include</i> "wx/object.h"<br> <br> ! <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <b><a name="wxClassInfo">wxClassInfo</a></b></font></font><blockquote> <font color=#CC3300> // <i>%override</i> <a href="#wxClassInfo">wxClassInfo</a>() constructor creates an instance using wxClassInfo::FindClass</font><br> <a href="#wxClassInfo">wxClassInfo</a>(const <a href="#wxString">wxString</a> &name)<br> *************** *** 3175,3181 **** --- 3176,3189 ---- <a href="#wxString">wxString</a> GetBaseClassName1() const<br> <a href="#wxString">wxString</a> GetBaseClassName2() const<br> + const <a href="#wxClassInfo">wxClassInfo</a> *GetBaseClass1() const<br> + const <a href="#wxClassInfo">wxClassInfo</a> *GetBaseClass2() const<br> <a href="#wxString">wxString</a> GetClassName() const<br> int GetSize() const<br> + bool IsDynamic()<br> bool IsKindOf(<a href="#wxClassInfo">wxClassInfo</a>* info)<br> + <br> + static const <a href="#wxClassInfo">wxClassInfo</a> *GetFirst()<br> + const <a href="#wxClassInfo">wxClassInfo</a> *GetNext() const<br> + <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 3324,3327 **** --- 3332,3352 ---- void SetData(<a href="#wxObject">wxObject</a> *data)<br> //int IndexOf() - unfortunately a protected member of wxNodeBase<br> + <br> + // To convert <a href="#wxObject">wxObject</a>* GetData() to another type use wxObject::DynamicCast<br> + // See <a href="#wxPenList">wxPenList</a>, <a href="#wxBrushList">wxBrushList</a>, <a href="#wxMenuItemList">wxMenuItemList</a>, <a href="#wxWindowList">wxWindowList</a><br> + <br> + // Example: How to use a <a href="#wxWindowList">wxWindowList</a><br> + // frame = wx.<a href="#wxFrame">wxFrame</a>(wx.NULL, wx.wxID_ANY, "Test");<br> + // win = wx.<a href="#wxWindow">wxWindow</a>(frame, wx.wxID_ANY)<br> + // frame:Show(true)<br> + // wlist = frame:GetChildren()<br> + // wlist:Item(0):GetData():DynamicCast("wxWindow"):SetBackgroundColour(wx.wxRED)<br> + <br> + // Example: How to use a <a href="#wxMenuItemList">wxMenuItemList</a><br> + // local fileMenu = wx.<a href="#wxMenu">wxMenu</a>()<br> + // fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program")<br> + // mList = fileMenu:GetMenuItems()<br> + // print(mList:GetCount(), mList:GetFirst():GetData():DynamicCast("wxMenuItem"):GetLabel())<br> + <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 3412,3415 **** --- 3437,3441 ---- <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxSortedArrayString">wxSortedArrayString</a></b>, <a href="#wxArrayString">wxArrayString</a></font></font><blockquote> <a href="#wxSortedArrayString">wxSortedArrayString</a>()<br> + <a href="#wxSortedArrayString">wxSortedArrayString</a>(const <a href="#wxArrayString">wxArrayString</a>& src) // have to have this constructor since they're not derived<br> <a href="#wxSortedArrayString">wxSortedArrayString</a>(const <a href="#wxSortedArrayString">wxSortedArrayString</a>& src)<br> <br> *************** *** 5170,5174 **** <a href="#wxDialog">wxDialog</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& title, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const <a href="#wxString">wxString</a>& name = "wxDialog")<br> <br> ! void Centre(int direction = wxBOTH)<br> bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& title, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const <a href="#wxString">wxString</a>& name = "wxDialog")<br> wxUSE_BUTTON <a href="#wxSizer">wxSizer</a>* CreateButtonSizer(long flags)<br> --- 5196,5200 ---- <a href="#wxDialog">wxDialog</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& title, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const <a href="#wxString">wxString</a>& name = "wxDialog")<br> <br> ! //void Centre(int direction = wxBOTH) - see <a href="#wxWindow">wxWindow</a><br> bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& title, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const <a href="#wxString">wxString</a>& name = "wxDialog")<br> wxUSE_BUTTON <a href="#wxSizer">wxSizer</a>* CreateButtonSizer(long flags)<br> *************** *** 5180,5184 **** // int GetAffirmativeId() const - pocketpc only<br> int GetReturnCode()<br> ! <a href="#wxString">wxString</a> GetTitle() const<br> //void Iconize(bool iconize) - in wxToplevelWindow<br> //bool IsIconized() const - in wxToplevelWindow<br> --- 5206,5210 ---- // int GetAffirmativeId() const - pocketpc only<br> int GetReturnCode()<br> ! // <a href="#wxString">wxString</a> GetTitle() const - see wxToplevelWindow<br> //void Iconize(bool iconize) - in wxToplevelWindow<br> //bool IsIconized() const - in wxToplevelWindow<br> *************** *** 5189,5193 **** void SetReturnCode(int retCode)<br> // void SetTitle(const <a href="#wxString">wxString</a>& title) - in wxToplevelWindow<br> ! bool Show(const bool show)<br> int ShowModal()<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> --- 5215,5219 ---- void SetReturnCode(int retCode)<br> // void SetTitle(const <a href="#wxString">wxString</a>& title) - in wxToplevelWindow<br> ! // bool Show(const bool show) - see <a href="#wxWindow">wxWindow</a><br> int ShowModal()<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> *************** *** 7921,7924 **** --- 7947,7953 ---- //void RemovePen(<a href="#wxPen">wxPen</a> *pen)<br> <a href="#wxPen">wxPen</a>* FindOrCreatePen(const <a href="#wxColour">wxColour</a>& colour, int width, int style)<br> + <br> + // Use the <a href="#wxList">wxList</a> methods, see also <a href="#wxNode">wxNode</a><br> + <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 7972,7975 **** --- 8001,8007 ---- //void RemoveBrush(<a href="#wxBrush">wxBrush</a> *brush)<br> <a href="#wxBrush">wxBrush</a>* FindOrCreateBrush(const <a href="#wxColour">wxColour</a>& colour, int style)<br> + <br> + // Use the <a href="#wxList">wxList</a> methods, see also <a href="#wxNode">wxNode</a><br> + <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 8258,8262 **** <a href="#wxCursor">wxCursor</a>(const <a href="#wxImage">wxImage</a>& image)<br> <br> ! bool Ok()<br> //<i>%win</i> WXHANDLE GetHandle()<br> //<i>%win</i> void SetHandle(WXHANDLE handle)<br> --- 8290,8294 ---- <a href="#wxCursor">wxCursor</a>(const <a href="#wxImage">wxImage</a>& image)<br> <br> ! //bool Ok() - see <a href="#wxBitmap">wxBitmap</a><br> //<i>%win</i> WXHANDLE GetHandle()<br> //<i>%win</i> void SetHandle(WXHANDLE handle)<br> *************** *** 10102,10106 **** void Display(const <a href="#wxString">wxString</a>& x)<br> void Display(const int id)<br> ! void DisplayContents()<br> void DisplayIndex()<br> bool KeywordSearch(const <a href="#wxString">wxString</a>& keyword, <a href="#wxHelpSearchMode">wxHelpSearchMode</a> mode = wxHELP_SEARCH_ALL)<br> --- 10134,10138 ---- void Display(const <a href="#wxString">wxString</a>& x)<br> void Display(const int id)<br> ! //void DisplayContents() - see <a href="#wxHelpController">wxHelpController</a><br> void DisplayIndex()<br> bool KeywordSearch(const <a href="#wxString">wxString</a>& keyword, <a href="#wxHelpSearchMode">wxHelpSearchMode</a> mode = wxHELP_SEARCH_ALL)<br> *************** *** 10265,10270 **** void SetWidthFloat(const <a href="#wxHtmlTag">wxHtmlTag</a>& tag, double pixel_scale = 1.0)<br> <br> ! <i>%wxchkver_2_5</i> <a href="#wxHtmlCell">wxHtmlCell</a>* GetFirstChild()<br> ! !<i>%wxchkver_2_5</i> <a href="#wxHtmlCell">wxHtmlCell</a>* GetFirstCell()<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 10297,10302 ---- void SetWidthFloat(const <a href="#wxHtmlTag">wxHtmlTag</a>& tag, double pixel_scale = 1.0)<br> <br> ! // <i>%wxchkver_2_5</i> <a href="#wxHtmlCell">wxHtmlCell</a>* GetFirstChild() see <a href="#wxHtmlCell">wxHtmlCell</a><br> ! // !<i>%wxchkver_2_5</i> <a href="#wxHtmlCell">wxHtmlCell</a>* GetFirstCell() - nobody probably uses this<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 11072,11078 **** <a href="#wxMDIChildFrame">wxMDIChildFrame</a>* GetActiveChild() const<br> <a href="#wxMDIClientWindow">wxMDIClientWindow</a>* GetClientWindow() const<br> ! virtual <a href="#wxWindow">wxWindow</a>* GetToolBar() const<br> <i>%win</i> <a href="#wxMenu">wxMenu</a>* GetWindowMenu() const<br> ! virtual void SetToolBar(<a href="#wxToolBar">wxToolBar</a>* toolbar)<br> <i>%win</i> void SetWindowMenu(<a href="#wxMenu">wxMenu</a>* menu)<br> void Tile(<a href="#wxOrientation">wxOrientation</a> orient = wxHORIZONTAL)<br> --- 11104,11110 ---- <a href="#wxMDIChildFrame">wxMDIChildFrame</a>* GetActiveChild() const<br> <a href="#wxMDIClientWindow">wxMDIClientWindow</a>* GetClientWindow() const<br> ! // virtual <a href="#wxToolBar">wxToolBar</a>* GetToolBar() const - see <a href="#wxFrame">wxFrame</a><br> <i>%win</i> <a href="#wxMenu">wxMenu</a>* GetWindowMenu() const<br> ! // virtual void SetToolBar(<a href="#wxToolBar">wxToolBar</a>* toolbar) - see <a href="#wxFrame">wxFrame</a><br> <i>%win</i> void SetWindowMenu(<a href="#wxMenu">wxMenu</a>* menu)<br> void Tile(<a href="#wxOrientation">wxOrientation</a> orient = wxHORIZONTAL)<br> *************** *** 11540,11547 **** <br> <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <b><a name="wxMenuItemList">wxMenuItemList</a></b>, <a href="#wxList">wxList</a></font></font><blockquote> ! void Clear()<br> ! void DeleteContents(bool destroy)<br> ! bool DeleteObject(<a href="#wxMenuItem">wxMenuItem</a> *pMenuItem)<br> ! int GetCount() const<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 11572,11579 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <b><a name="wxMenuItemList">wxMenuItemList</a></b>, <a href="#wxList">wxList</a></font></font><blockquote> ! // no constructor, you only get this back from wxMenu::GetMenuItems<br> ! <br> ! // Use the <a href="#wxList">wxList</a> methods, see also <a href="#wxNode">wxNode</a><br> ! <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 12936,12940 **** <br> int GetResponse() const<br> ! //<a href="#wxInputStream">wxInputStream</a> *GetInputStream(const <a href="#wxString">wxString</a>& path)<br> void SetHeader(const <a href="#wxString">wxString</a>& header, const <a href="#wxString">wxString</a>& h_data)<br> <a href="#wxString">wxString</a> GetHeader(const <a href="#wxString">wxString</a>& header)<br> --- 12968,12972 ---- <br> int GetResponse() const<br> ! // <a href="#wxInputStream">wxInputStream</a> *GetInputStream(const <a href="#wxString">wxString</a>& path) - see <a href="#wxProtocol">wxProtocol</a><br> void SetHeader(const <a href="#wxString">wxString</a>& header, const <a href="#wxString">wxString</a>& h_data)<br> <a href="#wxString">wxString</a> GetHeader(const <a href="#wxString">wxString</a>& header)<br> *************** *** 12973,12978 **** void SetPassive(bool pasv)<br> bool SetTransferMode(wxFTP::TransferMode mode)<br> ! void SetUser(const <a href="#wxString">wxString</a>& user)<br> ! void SetPassword(const <a href="#wxString">wxString</a>& passwd)<br> bool FileExists(const <a href="#wxString">wxString</a>& filename)<br> int GetFileSize(const <a href="#wxString">wxString</a>& filename)<br> --- 13005,13010 ---- void SetPassive(bool pasv)<br> bool SetTransferMode(wxFTP::TransferMode mode)<br> ! // void SetUser(const <a href="#wxString">wxString</a>& user) - see <a href="#wxProtocol">wxProtocol</a><br> ! // void SetPassword(const <a href="#wxString">wxString</a>& passwd) - see <a href="#wxProtocol">wxProtocol</a><br> bool FileExists(const <a href="#wxString">wxString</a>& filename)<br> int GetFileSize(const <a href="#wxString">wxString</a>& filename)<br> *************** *** 12980,12984 **** bool GetFilesList(<a href="#wxArrayString">wxArrayString</a>& files, const <a href="#wxString">wxString</a>& wildcard = "")<br> <a href="#wxOutputStream">wxOutputStream</a> * GetOutputStream(const <a href="#wxString">wxString</a>& file)<br> ! <a href="#wxInputStream">wxInputStream</a> * GetInputStream(const <a href="#wxString">wxString</a>& path)<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 13012,13016 ---- bool GetFilesList(<a href="#wxArrayString">wxArrayString</a>& files, const <a href="#wxString">wxString</a>& wildcard = "")<br> <a href="#wxOutputStream">wxOutputStream</a> * GetOutputStream(const <a href="#wxString">wxString</a>& file)<br> ! // <a href="#wxInputStream">wxInputStream</a> * GetInputStream(const <a href="#wxString">wxString</a>& path) - see <a href="#wxProtocol">wxProtocol</a><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 13726,13734 **** // wxNode::GetData():DynamicCast("wxWindow") to retrieve the <a href="#wxWindow">wxWindow</a><br> <br> ! // frame = wx.<a href="#wxFrame">wxFrame</a>(wx.NULL, wx.wxID_ANY, "Test");<br> ! // win = wx.<a href="#wxWindow">wxWindow</a>(frame, wx.wxID_ANY)<br> ! // frame:Show(true)<br> ! // wlist = frame:GetChildren()<br> ! // wlist:Item(0):GetData():DynamicCast("wxWindow"):SetBackgroundColour(wx.wxRED)<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 13758,13763 ---- // wxNode::GetData():DynamicCast("wxWindow") to retrieve the <a href="#wxWindow">wxWindow</a><br> <br> ! // Use the <a href="#wxList">wxList</a> methods, see also <a href="#wxNode">wxNode</a><br> ! <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 13744,13748 **** bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const <a href="#wxString">wxString</a>& name = "wxPanel")<br> //!<i>%wxchkver_2_7</i> <a href="#wxWindow">wxWindow</a>* GetDefaultItem() const - see <a href="#wxWindow">wxWindow</a><br> ! void InitDialog()<br> //!<i>%wxchkver_2_7</i> <a href="#wxWindow">wxWindow</a>* SetDefaultItem(<a href="#wxWindow">wxWindow</a> *win) - see <a href="#wxWindow">wxWindow</a><br> //virtual void SetFocus() - see <a href="#wxWindow">wxWindow</a><br> --- 13773,13777 ---- bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const <a href="#wxString">wxString</a>& name = "wxPanel")<br> //!<i>%wxchkver_2_7</i> <a href="#wxWindow">wxWindow</a>* GetDefaultItem() const - see <a href="#wxWindow">wxWindow</a><br> ! // void InitDialog() see <a href="#wxWindow">wxWindow</a><br> //!<i>%wxchkver_2_7</i> <a href="#wxWindow">wxWindow</a>* SetDefaultItem(<a href="#wxWindow">wxWindow</a> *win) - see <a href="#wxWindow">wxWindow</a><br> //virtual void SetFocus() - see <a href="#wxWindow">wxWindow</a><br> *************** *** 13761,13766 **** bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxControl")<br> void Command(<a href="#wxCommandEvent">wxCommandEvent</a>& event)<br> ! !<i>%wxchkver_2_6</i> <a href="#wxString">wxString</a> GetLabel() // see <a href="#wxWindow">wxWindow</a><br> ! !<i>%wxchkver_2_6</i> void SetLabel(const <a href="#wxString">wxString</a>& label) // see <a href="#wxWindow">wxWindow</a><br> <br> //static <a href="#wxString">wxString</a> GetLabelText(const <a href="#wxString">wxString</a>& label) translates arbitrary string, removes mnemonic characters ('&')<br> --- 13790,13795 ---- bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxControl")<br> void Command(<a href="#wxCommandEvent">wxCommandEvent</a>& event)<br> ! // <a href="#wxString">wxString</a> GetLabel() // see <a href="#wxWindow">wxWindow</a><br> ! // void SetLabel(const <a href="#wxString">wxString</a>& label) // see <a href="#wxWindow">wxWindow</a><br> <br> //static <a href="#wxString">wxString</a> GetLabelText(const <a href="#wxString">wxString</a>& label) translates arbitrary string, removes mnemonic characters ('&')<br> *************** *** 14243,14251 **** void GetViewStart() const<br> <br> ! <font color=#CC3300> // <i>%override</i> [int x, int y] GetVirtualSize() const</font><br> ! // C++ Func: void GetVirtualSize(int* x, int* y) const<br> ! void GetVirtualSize() const<br> <br> ! bool IsRetained() const<br> void PrepareDC(<a href="#wxDC">wxDC</a>& dc)<br> void Scroll(int x, int y)<br> --- 14272,14280 ---- void GetViewStart() const<br> <br> ! <font color=#CC3300> //// <i>%override</i> [int x, int y] GetVirtualSize() const</font><br> ! //// C++ Func: void GetVirtualSize(int* x, int* y) const<br> ! //void GetVirtualSize() const // see wxWindow::GetVirtualSize<br> <br> ! //bool IsRetained() const // see wxWindow::IsRetained<br> void PrepareDC(<a href="#wxDC">wxDC</a>& dc)<br> void Scroll(int x, int y)<br> *************** *** 14374,14379 **** <br> bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxStaticText")<br> ! <a href="#wxString">wxString</a> GetLabel() const<br> ! virtual void SetLabel(const <a href="#wxString">wxString</a>& label)<br> void Wrap(int width)<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> --- 14403,14408 ---- <br> bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxStaticText")<br> ! // <a href="#wxString">wxString</a> GetLabel() const - see <a href="#wxWindow">wxWindow</a><br> ! // void SetLabel(const <a href="#wxString">wxString</a>& label) - see <a href="#wxWindow">wxWindow</a><br> void Wrap(int width)<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> *************** *** 14418,14432 **** <br> <br> ! <font color=#007700><font size=+1><i>%enum</i> <a href="#wxLuaMethod_Type">wxLuaMethod_Type</a> // The type of a Lua <b><a name="method">method</a></b></font><blockquote> ! WXLUAMETHOD_CONSTRUCTOR // constructor<br> ! WXLUAMETHOD_METHOD // class member function<br> ! WXLUAMETHOD_CFUNCTION // global C function (not part of a class)<br> ! WXLUAMETHOD_GETPROP // Get <i>%property</i> funcName, read<br> ! WXLUAMETHOD_SETPROP // Set <i>%property</i> funcName, write<br> <br> ! WXLUAMETHOD_STATIC // Class member function is static<br> ! WXLUAMETHOD_OVERLOAD // This is an overload function that will call others<br> ! // and the min/maxargs for it are not valid,<br> ! // but are the min and max of all functions<br> <br> WXLUAMETHOD_OVERLOAD_BASE // Class method has been checked to see if it is<br> --- 14447,14465 ---- <br> <br> ! <font color=#007700><font size=+1><i>%enum</i> <a href="#wxLuaMethod_Type">wxLuaMethod_Type</a> // The type of a Lua <b><a name="method">method</a></b></font><blockquote> ! WXLUAMETHOD_CONSTRUCTOR // constructor<br> ! WXLUAMETHOD_METHOD // class member function<br> ! WXLUAMETHOD_CFUNCTION // global C function (not part of a class)<br> ! WXLUAMETHOD_GETPROP // Get <i>%property</i> funcName, read<br> ! WXLUAMETHOD_SETPROP // Set <i>%property</i> funcName, write<br> <br> ! WXLUAMETHOD_STATIC // Class member function is static<br> ! WXLUAMETHOD_OVERLOAD // This is an overload function that will call others<br> ! // and the min/maxargs for it are not valid,<br> ! // but are the min and max of all functions<br> ! <br> ! WXLUAMETHOD_DELETE // This is the delete function that wxLua has generated<br> ! // to delete this class and is not part of the<br> ! // original class.<br> <br> WXLUAMETHOD_OVERLOAD_BASE // Class method has been checked to see if it is<br> *************** *** 14446,14450 **** <font color=#007755><i>%define</i> WXLUAARG_UserData</font><br> <font color=#007755><i>%define</i> WXLUAARG_LuaThread</font><br> ! <font color=#007755><i>%define</i> WXLUAARG_Enum</font><br> <br> // Is this lua_type() (or in lua type()) considered<br> --- 14479,14483 ---- <font color=#007755><i>%define</i> WXLUAARG_UserData</font><br> <font color=#007755><i>%define</i> WXLUAARG_LuaThread</font><br> ! <font color=#007755><i>%define</i> WXLUAARG_Integer</font><br> <br> // Is this lua_type() (or in lua type()) considered<br> *************** *** 14470,14474 **** // Example : print(wxLuaBinding_wx.GetClassArray[1].methods[1].name)<br> // Note: Use only '.' and NO () to make it a function call, also check to see<br> ! // if the item exists first!<br> <br> /*<br> --- 14503,14507 ---- // Example : print(wxLuaBinding_wx.GetClassArray[1].methods[1].name)<br> // Note: Use only '.' and NO () to make it a function call, also check to see<br> ! // if the item exists first (unlike the example above)!<br> <br> /*<br> *************** *** 14520,14524 **** wxLuaBindMethod* basemethod<br> <br> ! <a href="#wxString">wxString</a> class_name // added, not in struct<br> <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> --- 14553,14558 ---- wxLuaBindMethod* basemethod<br> <br> ! wxLuaBindClass* class // class this is part of (not in struct)<br> ! <a href="#wxString">wxString</a> class_name // class name this is part of (not in struct)<br> <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> *************** *** 14593,14600 **** <font color=#CC3300> // <i>%override</i> [any value type] wxLuaObject::GetObject()</font><br> // C++ Func: bool GetObject()<br> ! // get the object, note C++ returns bool, this "returns" the referenced object<br> void GetObject() const<br> <br> ! // these are used to verify that things are working<br> //bool *GetBoolPtr();<br> //int *GetIntPtr();<br> --- 14627,14634 ---- <font color=#CC3300> // <i>%override</i> [any value type] wxLuaObject::GetObject()</font><br> // C++ Func: bool GetObject()<br> ! // get the object, note C++ returns bool, in lua it "returns" the referenced object<br> void GetObject() const<br> <br> ! // These are not useful in lua<br> //bool *GetBoolPtr();<br> //int *GetIntPtr();<br> *************** *** 14604,14608 **** int GetAllocationFlags() const<br> bool HasAllocationFlag(<a href="#wxLuaObject_Type">wxLuaObject_Type</a> flag)<br> ! int SetAllocationFlag(<a href="#wxLuaObject_Type">wxLuaObject_Type</a> flag, bool set)<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 14638,14642 ---- int GetAllocationFlags() const<br> bool HasAllocationFlag(<a href="#wxLuaObject_Type">wxLuaObject_Type</a> flag)<br> ! //int SetAllocationFlag(<a href="#wxLuaObject_Type">wxLuaObject_Type</a> flag, bool set) // NOT for use in lua<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 14633,14636 **** --- 14667,14674 ---- //bool OnPrintPage(int pageNum)<br> <br> + // Dummy test function to directly verify that the binding virtual functions really work.<br> + // This base class function appends "-Base" to the val string and returns it.<br> + virtual <a href="#wxString">wxString</a> TestVirtualFunctionBinding(const <a href="#wxString">wxString</a>& val) // { return val + wxT("-Base"); }<br> + <br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> |