Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets Makefile, 1.7, 1.8 appframe.i, 1.31, 1.32 clipdrag.i, 1.23, 1.24 config.i, 1.18, 1.19 controls.i, 1.33, 1.34 data.i, 1.26, 1.27 datetime.i, 1.24, 1.25 defsutil.i, 1.40, 1.41 dialogs.i, 1.27, 1.28 event.i, 1.20, 1.21 file.i, 1.20, 1.21 fl.i, 1.8, 1.9 gdi.i, 1.45, 1.46 geometry.i, 1.8, 1.9 grid.i, 1.11, 1.12 help.i, 1.12, 1.13 html.i, 1.16, 1.17 image.i, 1.23, 1.24 mdi.i, 1.11, 1.12 menutool.i, 1.14, 1.15 override.hpp, 1.65, 1.66 print.i, 1.14, 1.15 regex.i, 1.6, 1.7 sizer.i, 1.12, 1.13 socket.i, 1.10, 1.11 wave.i, 1.16, 1.17 windows.i, 1.33, 1.34 wx_rules.lua, 1.26, 1.27 wxlua.i, 1.20, 1.21 xml.i, 1.8, 1.9
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/bindings/wxwidgets Modified Files: Makefile appframe.i clipdrag.i config.i controls.i data.i datetime.i defsutil.i dialogs.i event.i file.i fl.i gdi.i geometry.i grid.i help.i html.i image.i mdi.i menutool.i override.hpp print.i regex.i sizer.i socket.i wave.i windows.i wx_rules.lua wxlua.i xml.i Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wave.i 14 Mar 2007 05:08:09 -0000 1.16 --- wave.i 31 May 2007 17:18:47 -0000 1.17 *************** *** 22,35 **** %class %delete %noclassinfo wxSound, wxObject ! %constructor wxSoundDefault() wxSound(const wxString& fileName, bool isResource = false) //wxSound(int size, const wxByte* data) bool Create(const wxString& fileName, bool isResource = false) ! //%rename CreateFromData bool Create(int size, const wxByte* data) bool IsOk() const !%win static bool IsPlaying() const bool Play(unsigned int flags = wxSOUND_ASYNC) const ! %rename PlayFile static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC) static void Stop() %endclass --- 22,35 ---- %class %delete %noclassinfo wxSound, wxObject ! wxSound() wxSound(const wxString& fileName, bool isResource = false) //wxSound(int size, const wxByte* data) bool Create(const wxString& fileName, bool isResource = false) ! //bool Create(int size, const wxByte* data) bool IsOk() const !%win static bool IsPlaying() const bool Play(unsigned int flags = wxSOUND_ASYNC) const ! static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC) static void Stop() %endclass *************** *** 45,50 **** %class %delete %noclassinfo wxWave, wxObject wxWave(const wxString& fileName, bool isResource = false) ! %constructor wxWaveDefault() bool Create(const wxString& fileName, bool isResource = false) bool IsOk() const --- 45,51 ---- %class %delete %noclassinfo wxWave, wxObject + wxWave() wxWave(const wxString& fileName, bool isResource = false) ! bool Create(const wxString& fileName, bool isResource = false) bool IsOk() const *************** *** 77,89 **** %endenum ! %define %string wxMEDIABACKEND_DIRECTSHOW //wxT("wxAMMediaBackend") ! %define %string wxMEDIABACKEND_MCI //wxT("wxMCIMediaBackend") ! %define %string wxMEDIABACKEND_QUICKTIME //wxT("wxQTMediaBackend") ! %define %string wxMEDIABACKEND_GSTREAMER //wxT("wxGStreamerMediaBackend") ! %wxchkver_2_8 %define %string wxMEDIABACKEND_REALPLAYER //wxT("wxRealPlayerMediaBackend") ! %wxchkver_2_8 %define %string wxMEDIABACKEND_WMP10 //wxT("wxWMP10MediaBackend") %class wxMediaCtrl, wxControl ! %constructor wxMediaCtrlDefault() wxMediaCtrl( wxWindow* parent, wxWindowID winid, const wxString& fileName = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& szBackend = "", const wxValidator& val = wxDefaultValidator, const wxString& name = "wxMediaCtrl" ) --- 78,90 ---- %endenum ! %define_string wxMEDIABACKEND_DIRECTSHOW //wxT("wxAMMediaBackend") ! %define_string wxMEDIABACKEND_MCI //wxT("wxMCIMediaBackend") ! %define_string wxMEDIABACKEND_QUICKTIME //wxT("wxQTMediaBackend") ! %define_string wxMEDIABACKEND_GSTREAMER //wxT("wxGStreamerMediaBackend") ! %wxchkver_2_8 %define_string wxMEDIABACKEND_REALPLAYER //wxT("wxRealPlayerMediaBackend") ! %wxchkver_2_8 %define_string wxMEDIABACKEND_WMP10 //wxT("wxWMP10MediaBackend") %class wxMediaCtrl, wxControl ! wxMediaCtrl() wxMediaCtrl( wxWindow* parent, wxWindowID winid, const wxString& fileName = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& szBackend = "", const wxValidator& val = wxDefaultValidator, const wxString& name = "wxMediaCtrl" ) *************** *** 95,100 **** wxFileOffset Length() bool Load(const wxString& fileName) ! %rename LoadFromURI bool Load(const wxURI& location) ! %rename LoadFromURIWithProxy bool Load(const wxURI& location, const wxURI& proxy) bool LoadURI(const wxString& fileName) // { return Load(wxURI(fileName)); } bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy) // { return Load(wxURI(fileName), wxURI(proxy)); } --- 96,101 ---- wxFileOffset Length() bool Load(const wxString& fileName) ! bool Load(const wxURI& location) ! bool Load(const wxURI& location, const wxURI& proxy) bool LoadURI(const wxString& fileName) // { return Load(wxURI(fileName)); } bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy) // { return Load(wxURI(fileName), wxURI(proxy)); } *************** *** 122,131 **** %class %delete wxMediaEvent, wxNotifyEvent ! %define %event wxEVT_MEDIA_FINISHED ! %define %event wxEVT_MEDIA_STOP ! %define %event wxEVT_MEDIA_LOADED ! %wxchkver_2_6_4 %define %event wxEVT_MEDIA_STATECHANGED ! %wxchkver_2_6_4 %define %event wxEVT_MEDIA_PLAY ! %wxchkver_2_6_4 %define %event wxEVT_MEDIA_PAUSE wxMediaEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) --- 123,132 ---- %class %delete wxMediaEvent, wxNotifyEvent ! %define_event wxEVT_MEDIA_FINISHED ! %define_event wxEVT_MEDIA_STOP ! %define_event wxEVT_MEDIA_LOADED ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_STATECHANGED ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_PLAY ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_PAUSE wxMediaEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) *************** *** 163,167 **** int GetNumberAxes() const int GetNumberButtons() const ! %wxchkver_2_8 %static int GetNumberJoysticks() const !%wxchkver_2_8 int GetNumberJoysticks() const int GetPollingMax() const --- 164,168 ---- int GetNumberAxes() const int GetNumberButtons() const ! %wxchkver_2_8 static int GetNumberJoysticks() const !%wxchkver_2_8 int GetNumberJoysticks() const int GetPollingMax() const *************** *** 207,214 **** %class %delete wxJoystickEvent, wxEvent ! %define %event wxEVT_JOY_BUTTON_DOWN ! %define %event wxEVT_JOY_BUTTON_UP ! %define %event wxEVT_JOY_MOVE ! %define %event wxEVT_JOY_ZMOVE wxJoystickEvent(wxEventType eventType = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0) --- 208,215 ---- %class %delete wxJoystickEvent, wxEvent ! %define_event wxEVT_JOY_BUTTON_DOWN ! %define_event wxEVT_JOY_BUTTON_UP ! %define_event wxEVT_JOY_MOVE ! %define_event wxEVT_JOY_ZMOVE wxJoystickEvent(wxEventType eventType = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0) Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 21 Dec 2006 06:02:03 -0000 1.7 --- Makefile 31 May 2007 17:18:46 -0000 1.8 *************** *** 13,24 **** include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind ! genwxbind: $(DEPFILES) @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt) ! genidocs: $(DEPFILES) @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genidocs.lua) --- 13,24 ---- include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! #DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind ! genwxbind: @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt) ! genidocs: @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genidocs.lua) Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** menutool.i 14 Mar 2007 05:08:09 -0000 1.14 --- menutool.i 31 May 2007 17:18:46 -0000 1.15 *************** *** 29,37 **** wxMenu(const wxString& title = "", long style = 0) // %override wxMenu* wxCreateMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators ! %constructor wxCreateMenu(int luatable, const wxString& title = "", long style = 0) wxMenuItem* Append(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! %rename AppendMenu wxMenuItem* Append(int id, const wxString& item, wxMenu *subMenu, const wxString& helpString = "") ! %rename AppendItem wxMenuItem* Append(wxMenuItem* menuItem) wxMenuItem* AppendCheckItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* AppendRadioItem(int id, const wxString& item, const wxString& helpString = "") --- 29,37 ---- wxMenu(const wxString& title = "", long style = 0) // %override wxMenu* wxCreateMenu({{wx.wxID_NEW, "&New\tCtrl-N", "New doc", [wx.wxITEM_NORMAL]}, {}, {item 2}}, const wxString& title = "", long style = "") - empty tables are separators ! %override_name wxLua_wxCreateMenu_constructor wxMenu(LuaTable luatable, const wxString& title = "", long style = 0) wxMenuItem* Append(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! wxMenuItem* Append(int id, const wxString& item, wxMenu *subMenu, const wxString& helpString = "") ! wxMenuItem* Append(wxMenuItem* menuItem) wxMenuItem* AppendCheckItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* AppendRadioItem(int id, const wxString& item, const wxString& helpString = "") *************** *** 40,46 **** void Check(int id, bool check) void Delete(int id) ! %rename DeleteItem void Delete(wxMenuItem *item) void Destroy(int id) ! %rename DestroyItem void Destroy(wxMenuItem *item) void Enable(int id, bool enable) int FindItem(const wxString& itemString) const --- 40,46 ---- void Check(int id, bool check) void Delete(int id) ! void Delete(wxMenuItem *item) void Destroy(int id) ! void Destroy(wxMenuItem *item) void Enable(int id, bool enable) int FindItem(const wxString& itemString) const *************** *** 54,58 **** wxString GetTitle() const wxMenuItem* Insert(size_t pos, int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! %rename InsertItem wxMenuItem* Insert(size_t pos, wxMenuItem *item) wxMenuItem* InsertCheckItem(size_t pos, int id, const wxString& item, const wxString& helpString = "") wxMenuItem* InsertRadioItem(size_t pos, int id, const wxString& item, const wxString& helpString = "") --- 54,58 ---- wxString GetTitle() const wxMenuItem* Insert(size_t pos, int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! wxMenuItem* Insert(size_t pos, wxMenuItem *item) wxMenuItem* InsertCheckItem(size_t pos, int id, const wxString& item, const wxString& helpString = "") wxMenuItem* InsertRadioItem(size_t pos, int id, const wxString& item, const wxString& helpString = "") *************** *** 61,76 **** bool IsEnabled(int id) const wxMenuItem* Prepend(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! %rename PrependItem wxMenuItem* Prepend(wxMenuItem *item) wxMenuItem* PrependCheckItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* PrependRadioItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* PrependSeparator() wxMenuItem* Remove(wxMenuItem *item) ! %rename RemoveById wxMenuItem* Remove(int id) void SetHelpString(int id, const wxString& helpString) void SetLabel(int id, const wxString& label) void SetTitle(const wxString& title) void UpdateUI(wxEvtHandler* source = NULL) const - - %property=Title, read %endclass --- 61,74 ---- bool IsEnabled(int id) const wxMenuItem* Prepend(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! wxMenuItem* Prepend(wxMenuItem *item) wxMenuItem* PrependCheckItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* PrependRadioItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* PrependSeparator() wxMenuItem* Remove(wxMenuItem *item) ! wxMenuItem* Remove(int id) void SetHelpString(int id, const wxString& helpString) void SetLabel(int id, const wxString& label) void SetTitle(const wxString& title) void UpdateUI(wxEvtHandler* source = NULL) const %endclass *************** *** 105,110 **** %wxchkver_2_8 virtual void UpdateMenus() - - %property=MenuCount, read %endclass --- 103,106 ---- *************** *** 149,154 **** // void SetName(const wxString& text) const - deprecated %win void SetTextColour(const wxColour& colour) const - - %property=Help, read, write %endclass --- 145,148 ---- *************** *** 161,166 **** bool DeleteObject(wxMenuItem *pMenuItem) int GetCount() const - - %property=Count, read %endclass --- 155,158 ---- *************** *** 171,177 **** %class %delete wxMenuEvent, wxEvent ! %define %event wxEVT_MENU_HIGHLIGHT ! %define %event wxEVT_MENU_OPEN ! %define %event wxEVT_MENU_CLOSE wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0, wxMenu* menu = NULL) --- 163,169 ---- %class %delete wxMenuEvent, wxEvent ! %define_event wxEVT_MENU_HIGHLIGHT ! %define_event wxEVT_MENU_OPEN ! %define_event wxEVT_MENU_CLOSE wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0, wxMenu* menu = NULL) *************** *** 208,213 **** wxToolBarToolBase* AddSeparator() wxToolBarToolBase* AddTool(int toolId, const wxString& label, const wxBitmap& bitmap1, const wxBitmap& bitmap2 = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelpString = "", const wxString& longHelpString = "", wxObject* clientData = NULL) ! %rename AddToolSimple wxToolBarToolBase* AddTool(int toolId, const wxString& label, const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL) ! %rename AddToolTool wxToolBarToolBase* AddTool(wxToolBarToolBase* tool) wxToolBarToolBase *AddCheckTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) wxToolBarToolBase *AddRadioTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) --- 200,205 ---- wxToolBarToolBase* AddSeparator() wxToolBarToolBase* AddTool(int toolId, const wxString& label, const wxBitmap& bitmap1, const wxBitmap& bitmap2 = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelpString = "", const wxString& longHelpString = "", wxObject* clientData = NULL) ! wxToolBarToolBase* AddTool(int toolId, const wxString& label, const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL) ! wxToolBarToolBase* AddTool(wxToolBarToolBase* tool) wxToolBarToolBase *AddCheckTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) wxToolBarToolBase *AddRadioTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL) *************** *** 234,243 **** wxToolBarToolBase* InsertControl(size_t pos, wxControl *control) wxToolBarToolBase* InsertSeparator(size_t pos) ! %rename InsertToolSimple wxToolBarToolBase* InsertTool(size_t pos, int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = false, wxObject *clientData = NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "") wxToolBarToolBase* InsertTool(size_t pos, int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *clientData = NULL) ! %rename InsertToolTool wxToolBarToolBase * InsertTool(size_t pos, wxToolBarToolBase* tool) wxToolBarToolBase* RemoveTool(int id) bool Realize() ! %rename SetMarginsXY void SetMargins(int x, int y) void SetMargins(const wxSize& size) void SetToolBitmapSize(const wxSize& size) --- 226,235 ---- wxToolBarToolBase* InsertControl(size_t pos, wxControl *control) wxToolBarToolBase* InsertSeparator(size_t pos) ! wxToolBarToolBase* InsertTool(size_t pos, int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = false, wxObject *clientData = NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "") wxToolBarToolBase* InsertTool(size_t pos, int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *clientData = NULL) ! wxToolBarToolBase * InsertTool(size_t pos, wxToolBarToolBase* tool) wxToolBarToolBase* RemoveTool(int id) bool Realize() ! void SetMargins(int x, int y) void SetMargins(const wxSize& size) void SetToolBitmapSize(const wxSize& size) *************** *** 251,263 **** void SetMaxRowsCols(int rows, int cols) void ToggleTool(int toolId, const bool toggle) - - %property=ToolEnabled, read - %property=ToolSize, read - %property=MaxRows, read - %property=MaxCols, read - %property=ToolMargins, read - %property=ToolPacking, read, write - %property=ToolSeparation, read, write - %property=ToolBitmapSize, read, write %endclass --- 243,246 ---- *************** *** 268,273 **** %class wxToolBar, wxToolBarBase wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = "wxToolBar") - %constructor wxToolBarDefault() bool Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = "wxToolBar") --- 251,256 ---- %class wxToolBar, wxToolBarBase + wxToolBar() wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = "wxToolBar") bool Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = "wxToolBar") *************** *** 282,287 **** %class wxToolBarSimple, wxToolBarBase wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) ! %constructor wxPreToolBarSimple() bool Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) --- 265,271 ---- %class wxToolBarSimple, wxToolBarBase + wxToolBarSimple() wxToolBarSimple(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) ! bool Create(wxWindow *parent,wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString &name = wxToolBarNameStr) wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) *************** *** 337,347 **** wxObject *GetClientData() void SetClientData(wxObject* clientData) - - %property=NormalBitmap, read, write - %property=DisabledBitmap, read, write - %property=Bitmap, read - %property=ClientData, read, write - %property=LongHelp, read, write - %property=ShortHelp, read, write %endclass --- 321,324 ---- Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** clipdrag.i 9 Mar 2007 00:15:12 -0000 1.23 --- clipdrag.i 31 May 2007 17:18:46 -0000 1.24 *************** *** 16,21 **** %class wxClipboard, wxObject ! !%wxchkver_2_5 %define %pointer wxTheClipboard ! %wxchkver_2_5 %staticonly wxClipboard *Get() // wxClipboard() use global clipboard only --- 16,21 ---- %class wxClipboard, wxObject ! !%wxchkver_2_5 %define_pointer wxTheClipboard ! %wxchkver_2_5 static wxClipboard *Get() // wxClipboard() use global clipboard only *************** *** 48,54 **** %class %delete wxClipboardTextEvent, wxCommandEvent ! %define %event wxEVT_COMMAND_TEXT_COPY ! %define %event wxEVT_COMMAND_TEXT_CUT ! %define %event wxEVT_COMMAND_TEXT_PASTE wxClipboardTextEvent(wxEventType type = wxEVT_NULL, wxWindowID winid = 0) --- 48,54 ---- %class %delete wxClipboardTextEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_TEXT_COPY ! %define_event wxEVT_COMMAND_TEXT_CUT ! %define_event wxEVT_COMMAND_TEXT_PASTE wxClipboardTextEvent(wxEventType type = wxEVT_NULL, wxWindowID winid = 0) *************** *** 91,98 **** %class %delete %noclassinfo %encapsulate wxDataFormat ! %define %object wxFormatInvalid ! %overload wxDataFormat(wxDataFormatId format = wxDF_INVALID) ! %overload %constructor wxDataFormatUser(const wxString &format) wxString GetId() const --- 91,98 ---- %class %delete %noclassinfo %encapsulate wxDataFormat ! %define_object wxFormatInvalid ! wxDataFormat(wxDataFormatId format = wxDF_INVALID) ! wxDataFormat(const wxString &format) wxString GetId() const *************** *** 102,108 **** %operator bool operator==(const wxDataFormat& format) const - - %property=Id, read, write - %property=Type, read, write %endclass --- 102,105 ---- *************** *** 147,153 **** //virtual bool SetData(size_t len, const void *buf) virtual bool SetData(const wxString& str) - - %property=DataSize, read - %property=Format, read, write %endclass --- 144,147 ---- *************** *** 286,291 **** %win|%mac wxDropSource(wxWindow* win = NULL, const wxCursor& cursorCopy = wxNullCursor, const wxCursor& cursorMove = wxNullCursor, const wxCursor& cursorStop = wxNullCursor) %gtk wxDropSource(wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) ! %win %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxCursor& cursorCopy = wxNullCursor, const wxCursor& cursorMove = wxNullCursor, const wxCursor& cursorStop = wxNullCursor) ! %gtk %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) void SetData(wxDataObject& data) --- 280,285 ---- %win|%mac wxDropSource(wxWindow* win = NULL, const wxCursor& cursorCopy = wxNullCursor, const wxCursor& cursorMove = wxNullCursor, const wxCursor& cursorStop = wxNullCursor) %gtk wxDropSource(wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) ! %win wxDropSource(wxDataObject& data, wxWindow* win = NULL, const wxCursor& cursorCopy = wxNullCursor, const wxCursor& cursorMove = wxNullCursor, const wxCursor& cursorStop = wxNullCursor) ! %gtk wxDropSource(wxDataObject& data, wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) void SetData(wxDataObject& data) *************** *** 302,306 **** %class %delete wxDropFilesEvent, wxEvent ! %define %event wxEVT_DROP_FILES // wxDropFilesEvent(WXTYPE id = 0, int noFiles = 0, wxString* files = NULL) only handle this event --- 296,300 ---- %class %delete wxDropFilesEvent, wxEvent ! %define_event wxEVT_DROP_FILES // wxDropFilesEvent(WXTYPE id = 0, int noFiles = 0, wxString* files = NULL) only handle this event Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** data.i 19 Mar 2007 03:47:18 -0000 1.26 --- data.i 31 May 2007 17:18:46 -0000 1.27 *************** *** 89,97 **** int GetSize() const bool IsKindOf(wxClassInfo* info) - - %property=BaseClassName1, read - %property=BaseClassName2, read - %property=ClassName, read - %property=Size, read %endclass --- 89,92 ---- *************** *** 106,110 **** %class wxValidator, wxEvtHandler ! %define %object wxDefaultValidator wxWindow* GetWindow() const --- 101,105 ---- %class wxValidator, wxEvtHandler ! %define_object wxDefaultValidator wxWindow* GetWindow() const *************** *** 114,119 **** virtual bool TransferToWindow() virtual bool Validate(wxWindow* parent) - - %property=Window, read, write %endclass --- 109,112 ---- *************** *** 150,159 **** //!%wxchkver_2_5|%wxcompat_2_4 void SetExcludeList(const wxStringList& stringList) //!%wxchkver_2_5|%wxcompat_2_4 void SetIncludeList(const wxStringList& stringList) - //!%wxchkver_2_5|%wxcompat_2_4 %property=ExcludeList, read, write - //!%wxchkver_2_5|%wxcompat_2_4 %property=IncludeList, read, write - - %wxchkver_2_5 %property=Excludes, read, write - %wxchkver_2_5 %property=Includes, read, write - %property=Style, read, write %endclass --- 143,146 ---- *************** *** 197,224 **** wxList() ! %overload wxNode *Append(wxObject *object) ! %overload %rename AppendNumKey wxNode *Append(long key, wxObject *object) ! %overload %rename AppendStringKey wxNode *Append(const wxString& key, wxObject *object) void Clear() void DeleteContents(bool destroy) bool DeleteNode(wxNode *pNode) bool DeleteObject(wxObject *pObject) ! %overload wxNode* Find(wxObject* pObject) ! %overload %rename FindNumKey wxNode *Find(long key) ! %overload %rename FindStringKey wxNode *Find(const wxString &key) int GetCount() const wxNode *GetFirst() wxNode *GetLast() int IndexOf(wxObject* pObject) ! %overload wxNode *Insert(wxObject *pObject) ! %overload %rename InsertAt wxNode *Insert(size_t position, wxObject *pObject) ! %overload %rename InsertBefore wxNode *Insert(wxNode *pNode, wxObject *pObject) bool IsEmpty() const wxNode *Item(int iIndex) const wxNode *Member(wxObject *pObject) - - %property=Count, read - %property=First, read - %property=Last, read %endclass --- 184,207 ---- wxList() ! wxNode *Append(wxObject *object) ! wxNode *Append(long key, wxObject *object) ! wxNode *Append(const wxString& key, wxObject *object) void Clear() void DeleteContents(bool destroy) bool DeleteNode(wxNode *pNode) bool DeleteObject(wxObject *pObject) ! wxNode* Find(wxObject* pObject) ! wxNode *Find(long key) ! wxNode *Find(const wxString &key) int GetCount() const wxNode *GetFirst() wxNode *GetLast() int IndexOf(wxObject* pObject) ! wxNode *Insert(wxObject *pObject) ! wxNode *Insert(size_t position, wxObject *pObject) ! wxNode *Insert(wxNode *pNode, wxObject *pObject) bool IsEmpty() const wxNode *Item(int iIndex) const wxNode *Member(wxObject *pObject) %endclass *************** *** 234,241 **** void SetData(wxObject *data) //int IndexOf() - unfortunately a protected member of wxNodeBase - - %property=Data, read, write - %property=Previous, read - %property=Next, read %endclass --- 217,220 ---- *************** *** 256,260 **** // void RemoveAt(size_t index, size_t count = 1) // void Shrink() - // %property=Count, read //%endclass --- 235,238 ---- *************** *** 267,273 **** %class %delete %noclassinfo %encapsulate wxArrayInt ! %overload wxArrayInt() ! %overload %constructor wxArrayIntCopy(const wxArrayInt& array) ! %overload %constructor wxArrayIntFromTable(const wxArrayInt_FromLuaTable& array) // %override [lua table] wxArrayInt::ToLuaTable() const --- 245,251 ---- %class %delete %noclassinfo %encapsulate wxArrayInt ! wxArrayInt() ! wxArrayInt(const wxArrayInt& array) ! wxArrayInt(const wxArrayInt_FromLuaTable& array) // %override [lua table] wxArrayInt::ToLuaTable() const *************** *** 286,291 **** void RemoveAt(size_t index) void Shrink() - - %property=Count, read %endclass --- 264,267 ---- *************** *** 300,306 **** %class %delete %noclassinfo %encapsulate wxArrayString ! %overload wxArrayString() ! %overload %constructor wxArrayStringCopy(const wxArrayString& array) ! %overload %constructor wxArrayStringFromTable(const wxArrayString_FromLuaTable& array) // %override [lua table] wxArrayString::ToLuaTable() const --- 276,282 ---- %class %delete %noclassinfo %encapsulate wxArrayString ! wxArrayString() ! wxArrayString(const wxArrayString& array) ! wxArrayString(const wxArrayString_FromLuaTable& array) // %override [lua table] wxArrayString::ToLuaTable() const *************** *** 330,337 **** %class %delete %noclassinfo %encapsulate wxSortedArrayString, wxArrayString ! %overload wxSortedArrayString() ! //%constructor wxSortedArrayStringCopy(const wxSortedArrayString& array) ! %overload %constructor wxSortedArrayStringCopy(const wxSortedArrayString& src) ! %overload %constructor wxSortedArrayStringFromTable(const wxArrayString_FromLuaTable& array) %endclass --- 306,312 ---- %class %delete %noclassinfo %encapsulate wxSortedArrayString, wxArrayString ! wxSortedArrayString() ! wxSortedArrayString(const wxSortedArrayString& src) ! wxSortedArrayString(const wxArrayString_FromLuaTable& array) %endclass *************** *** 373,385 **** // wxObject * Delete(long key) // void DeleteContents(bool flag) ! // %rename GetNumKey wxObject * Get(long key) ! // %rename GetStringKey wxObject * Get(const wxString &key) // long MakeKey(const wxString& string) // !%wxchkver_2_5 wxNode * Next() // %wxchkver_2_5 wxHashTable::Node * Next() ! // %rename PutNumKey void Put(long key, wxObject *object) ! // %rename PutStringKey void Put(const wxString & key, wxObject *object) // int GetCount() const - // %property=Count, read //%endclass --- 348,359 ---- // wxObject * Delete(long key) // void DeleteContents(bool flag) ! // wxObject * Get(long key) ! // wxObject * Get(const wxString &key) // long MakeKey(const wxString& string) // !%wxchkver_2_5 wxNode * Next() // %wxchkver_2_5 wxHashTable::Node * Next() ! // void Put(long key, wxObject *object) ! // void Put(const wxString & key, wxObject *object) // int GetCount() const //%endclass Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** print.i 9 Mar 2007 00:15:12 -0000 1.14 --- print.i 31 May 2007 17:18:47 -0000 1.15 *************** *** 242,246 **** %class %delete wxPrintData, wxObject wxPrintData() ! %constructor wxPrintDataCopy(const wxPrintData& data) wxPrintData *Copy() --- 242,246 ---- %class %delete wxPrintData, wxObject wxPrintData() ! wxPrintData(const wxPrintData& data) wxPrintData *Copy() *************** *** 298,323 **** //!%wxchkver_2_7 void SetPrinterTranslateY(long y) //!%wxchkver_2_7 void SetPrinterTranslation(long x, long y) - - %property=Collate, read, write - %property=Colour, read, write - %property=Duplex, read, write - %property=Filename, read, write - %property=NoCopies, read, write - %property=Orientation, read, write - %property=PaperId, read, write - %property=PaperSize, read, write - %property=PrinterName, read, write - %property=PrintMode, read, write - %property=Quality, read, write - - //!%wxchkver_2_7 %property=FontMetricPath, read, write - //!%wxchkver_2_7 %property=PreviewCommand, read, write - //!%wxchkver_2_7 %property=PrinterCommand, read, write - //!%wxchkver_2_7 %property=PrinterOptions, read, write - //!%wxchkver_2_7 %property=PrinterScaleX, read, write - //!%wxchkver_2_7 %property=PrinterScaleY, read, write - //!%wxchkver_2_7 %property=PrinterTranslateX, read, write - //!%wxchkver_2_7 %property=PrinterTranslateY, read, write - %endclass --- 298,301 ---- *************** *** 327,331 **** %class %delete wxPageSetupDialogData, wxObject wxPageSetupDialogData() ! %constructor wxPageSetupDialogDataCopy(const wxPageSetupDialogData& data) wxPageSetupDialogData *Copy() --- 305,309 ---- %class %delete wxPageSetupDialogData, wxObject wxPageSetupDialogData() ! wxPageSetupDialogData(const wxPageSetupDialogData& data) wxPageSetupDialogData *Copy() *************** *** 367,385 **** //wxPageSetupDialogData& operator=(const wxPageSetupData& data) //wxPageSetupDialogData& operator=(const wxPrintData& data) - - %property=EnableHelp, read - %property=EnableMargins, read - %property=EnableOrientation, read - %property=EnablePaper, read - %property=EnablePrinter, read - %property=DefaultInfo, read, write - %property=DefaultMinMargins, read, write - %property=MarginBottomRight, read, write - %property=MarginTopLeft, read, write - %property=MinMarginBottomRight, read, write - %property=MinMarginTopLeft, read, write - %property=PaperId, read, write - %property=PaperSize, read, write - %property=PrintData, read, write %endclass --- 345,348 ---- *************** *** 396,401 **** wxPageSetupDialogData& GetPageSetupDialogData() int ShowModal() - - %property=PageSetupDialogData, read %endclass --- 359,362 ---- *************** *** 410,416 **** wxDC* GetPrintDC() int ShowModal() - - %property=PrintDialogData, read - %property=PrintDC, read %endclass --- 371,374 ---- *************** *** 420,425 **** %class %delete wxPrintDialogData, wxObject wxPrintDialogData() ! %constructor wxPrintDialogDataCopy(const wxPrintDialogData& dialogData) ! %constructor wxPrintDialogDataFromPrintData(const wxPrintData& data) // copied straight from cmndata.h not docs --- 378,383 ---- %class %delete wxPrintDialogData, wxObject wxPrintDialogData() ! wxPrintDialogData(const wxPrintDialogData& dialogData) ! wxPrintDialogData(const wxPrintData& data) // copied straight from cmndata.h not docs *************** *** 457,469 **** %operator void operator=(const wxPrintDialogData& data) - - %property=Collate, read, write - %property=FromPage, read, write - %property=MinPage, read, write - %property=MaxPage, read, write - %property=NoCopies, read, write - %property=PrintData, read, write - %property=PrintToFile, read, write - %property=ToPage, read, write %endclass --- 415,418 ---- *************** *** 529,536 **** void SetPrintout(wxLuaPrintout *printout) void SetZoom(int percent) - - %property=Canvas, read, write - %property=Frame, read, write - %property=Printout, read, write %endclass --- 478,481 ---- Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** file.i 15 Mar 2007 14:20:15 -0000 1.20 --- file.i 31 May 2007 17:18:46 -0000 1.21 *************** *** 56,72 **** // wxLua only has storage for wxChar* in bindings, wxFILE_SEP_XXX are #defined // as wxChar wxT('.'), so we just redefine them to be wxT(".") or wxChar* ! %define %string wxFILE_SEP_EXT wxT(".") ! %define %string wxFILE_SEP_DSK wxT(":") ! %define %string wxFILE_SEP_PATH_DOS wxT("\\") ! %define %string wxFILE_SEP_PATH_UNIX wxT("/") ! %define %string wxFILE_SEP_PATH_MAC wxT(":") ! %define %string wxFILE_SEP_PATH_VMS wxT(".") // VMS also uses '[' and ']' ! %define %string wxFILE_SEP_PATH wxLua_FILE_SEP_PATH // hack to convert from wxChar wxT('') to wxChar* wxT("") ! %define %string wxPATH_SEP_DOS // wxT(";") ! %define %string wxPATH_SEP_UNIX // wxT(":") ! %define %string wxPATH_SEP_MAC // wxT(";") ! %define %string wxPATH_SEP // wxPATH_SEP_XXX %define wxARE_FILENAMES_CASE_SENSITIVE // bool 1/0 --- 56,72 ---- // wxLua only has storage for wxChar* in bindings, wxFILE_SEP_XXX are #defined // as wxChar wxT('.'), so we just redefine them to be wxT(".") or wxChar* ! %define_string wxFILE_SEP_EXT wxT(".") ! %define_string wxFILE_SEP_DSK wxT(":") ! %define_string wxFILE_SEP_PATH_DOS wxT("\\") ! %define_string wxFILE_SEP_PATH_UNIX wxT("/") ! %define_string wxFILE_SEP_PATH_MAC wxT(":") ! %define_string wxFILE_SEP_PATH_VMS wxT(".") // VMS also uses '[' and ']' ! %define_string wxFILE_SEP_PATH wxLua_FILE_SEP_PATH // hack to convert from wxChar wxT('') to wxChar* wxT("") ! %define_string wxPATH_SEP_DOS // wxT(";") ! %define_string wxPATH_SEP_UNIX // wxT(":") ! %define_string wxPATH_SEP_MAC // wxT(";") ! %define_string wxPATH_SEP // wxPATH_SEP_XXX %define wxARE_FILENAMES_CASE_SENSITIVE // bool 1/0 *************** *** 90,94 **** !%wxchkver_2_8 void Add(const wxString& path) %wxchkver_2_8 bool Add(const wxString& path) ! %wxchkver_2_8 %rename AddArray void Add(const wxArrayString_FromLuaTable& paths) // Find the first full path for which the file exists wxString FindValidPath(const wxString& filename) const --- 90,94 ---- !%wxchkver_2_8 void Add(const wxString& path) %wxchkver_2_8 bool Add(const wxString& path) ! %wxchkver_2_8 void Add(const wxArrayString_FromLuaTable& paths) // Find the first full path for which the file exists wxString FindValidPath(const wxString& filename) const *************** *** 97,102 **** wxString FindAbsoluteValidPath(const wxString& filename) const // Given full path and filename, add path to list ! !%wxchkver_2_8 void EnsureFileAccessible(const wxString& path) ! %wxchkver_2_8 bool EnsureFileAccessible(const wxString& path) %endclass --- 97,102 ---- wxString FindAbsoluteValidPath(const wxString& filename) const // Given full path and filename, add path to list ! %not_overload !%wxchkver_2_8 void EnsureFileAccessible(const wxString& path) ! %not_overload %wxchkver_2_8 bool EnsureFileAccessible(const wxString& path) %endclass *************** *** 114,119 **** %define wxPATH_MKDIR_FULL ! //%define %string wxFILE_SEP_PATH // this is wxChar see override wxFileSeparator ! //%define %string wxPATH_SEP // this is wxChar see override wxFileSeparator %define wxFILE %define wxDIR --- 114,119 ---- %define wxPATH_MKDIR_FULL ! //%define_string wxFILE_SEP_PATH // this is wxChar see override wxFileSeparator ! //%define_string wxPATH_SEP // this is wxChar see override wxFileSeparator %define wxFILE %define wxDIR *************** *** 143,163 **** %class %delete %noclassinfo %encapsulate wxFileName ! %constructor wxFileNameDefault() ! %constructor wxFileNameCopy(const wxFileName& filename) wxFileName(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! %constructor wxFileNamePath(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! %constructor wxFileNameVolume(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AppendDir(const wxString& dir) ! %overload void Assign(const wxFileName& filepath) ! %overload %rename AssignFullName void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignVolume void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignPath void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignPathNameExt void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AssignCwd(const wxString& volume = "") void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE) void AssignHomeDir() !%wxchkver_2_8 void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL) ! %wxchkver_2_8&&(wxUSE_FILE||wxUSE_FFILE) %rename AssignTempFileNameGetName void AssignTempFileName(const wxString& prefix) %wxchkver_2_8&&wxUSE_FILE void AssignTempFileName(const wxString& prefix, wxFile *fileTemp) //%wxchkver_2_8&&wxUSE_FFILE void AssignTempFileName(const wxString& prefix, wxFFile *fileTemp) --- 143,163 ---- %class %delete %noclassinfo %encapsulate wxFileName ! wxFileName() ! wxFileName(const wxFileName& filename) wxFileName(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! wxFileName(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! wxFileName(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AppendDir(const wxString& dir) ! void Assign(const wxFileName& filepath) ! void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) ! void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AssignCwd(const wxString& volume = "") void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE) void AssignHomeDir() !%wxchkver_2_8 void AssignTempFileName(const wxString& prefix, wxFile *fileTemp = NULL) ! %wxchkver_2_8&&(wxUSE_FILE||wxUSE_FFILE) void AssignTempFileName(const wxString& prefix) %wxchkver_2_8&&wxUSE_FILE void AssignTempFileName(const wxString& prefix, wxFile *fileTemp) //%wxchkver_2_8&&wxUSE_FFILE void AssignTempFileName(const wxString& prefix, wxFFile *fileTemp) *************** *** 170,177 **** //%wxchkver_2_8&&wxUSE_FFILE static wxString CreateTempFileName(const wxString& prefix, wxFFile *fileTemp); bool DirExists() ! %rename DirExistsName static bool DirExists(const wxString& dir) static wxFileName DirName(const wxString& dir) bool FileExists() ! %rename FileExistsName static bool FileExists(const wxString& file) static wxFileName FileName(const wxString& file) static wxString GetCwd(const wxString& volume = "") --- 170,177 ---- //%wxchkver_2_8&&wxUSE_FFILE static wxString CreateTempFileName(const wxString& prefix, wxFFile *fileTemp); bool DirExists() ! static bool DirExists(const wxString& dir) static wxFileName DirName(const wxString& dir) bool FileExists() ! static bool FileExists(const wxString& file) static wxFileName FileName(const wxString& file) static wxString GetCwd(const wxString& volume = "") *************** *** 227,239 **** bool MakeRelativeTo(const wxString& pathBase = "", wxPathFormat format = wxPATH_NATIVE) bool Mkdir(int perm = 4095, int flags = 0) ! %rename MkdirName static bool Mkdir(const wxString& dir, int perm = 4095, int flags = 0) bool Normalize(int flags = wxPATH_NORM_ALL, const wxString& cwd = wxEmptyString, wxPathFormat format = wxPATH_NATIVE) void PrependDir(const wxString& dir) void RemoveDir(int pos) bool Rmdir() ! %rename RmdirName static bool Rmdir(const wxString& dir) bool SameAs(const wxFileName& filepath, wxPathFormat format = wxPATH_NATIVE) const bool SetCwd() ! %rename SetCwdName static bool SetCwd(const wxString& cwd) void SetExt(const wxString& ext) void SetEmptyExt() --- 227,239 ---- bool MakeRelativeTo(const wxString& pathBase = "", wxPathFormat format = wxPATH_NATIVE) bool Mkdir(int perm = 4095, int flags = 0) ! static bool Mkdir(const wxString& dir, int perm = 4095, int flags = 0) bool Normalize(int flags = wxPATH_NORM_ALL, const wxString& cwd = wxEmptyString, wxPathFormat format = wxPATH_NATIVE) void PrependDir(const wxString& dir) void RemoveDir(int pos) bool Rmdir() ! static bool Rmdir(const wxString& dir) bool SameAs(const wxFileName& filepath, wxPathFormat format = wxPATH_NATIVE) const bool SetCwd() ! static bool SetCwd(const wxString& cwd) void SetExt(const wxString& ext) void SetEmptyExt() *************** *** 308,312 **** %class %delete %noclassinfo %encapsulate wxFile wxFile() ! %constructor wxFileOpen(const wxString& filename, wxFile::OpenMode mode = wxFile::read) static bool Access(const wxString& name, wxFile::OpenMode mode) --- 308,312 ---- %class %delete %noclassinfo %encapsulate wxFile wxFile() ! wxFile(const wxString& filename, wxFile::OpenMode mode = wxFile::read) static bool Access(const wxString& name, wxFile::OpenMode mode) *************** *** 331,335 **** //size_t Write(const void* buffer, unsigned int count) size_t Write(const wxString& buffer, unsigned int count) ! %rename WriteString size_t Write(const wxString &str) //, const wxMBConv& conv = wxConvUTF8) %endclass --- 331,335 ---- //size_t Write(const void* buffer, unsigned int count) size_t Write(const wxString& buffer, unsigned int count) ! size_t Write(const wxString &str) //, const wxMBConv& conv = wxConvUTF8) %endclass *************** *** 340,344 **** %class %noclassinfo %encapsulate %delete wxTempFile ! %constructor wxTempFileDefault() // associates the temp file with the file to be replaced and opens it wxTempFile(const wxString& strName) --- 340,344 ---- %class %noclassinfo %encapsulate %delete wxTempFile ! wxTempFile() // associates the temp file with the file to be replaced and opens it wxTempFile(const wxString& strName) *************** *** 384,388 **** %class %delete %noclassinfo %encapsulate wxDir wxDir() ! %constructor wxDirOpen(const wxString& dir) static bool Exists(const wxString& dir) --- 384,388 ---- %class %delete %noclassinfo %encapsulate wxDir wxDir() ! wxDir(const wxString& dir) static bool Exists(const wxString& dir) *************** *** 448,452 **** %class %noclassinfo wxInputStream, wxStreamBase ! // wxInputStream() this os only a base class bool CanRead() const --- 448,452 ---- %class %noclassinfo wxInputStream, wxStreamBase ! // wxInputStream() this is only a base class bool CanRead() const *************** *** 458,462 **** //wxInputStream& Read(void *buffer, size_t size) wxInputStream& Read(size_t size) ! %rename ReadStream wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const --- 458,462 ---- //wxInputStream& Read(void *buffer, size_t size) wxInputStream& Read(size_t size) ! wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const *************** *** 481,485 **** //wxOutputStream& Write(const void *buffer, size_t size) wxOutputStream& Write(const wxString& buffer, size_t size) ! %rename WriteStream wxOutputStream& Write(wxInputStream& stream_in) %endclass --- 481,485 ---- //wxOutputStream& Write(const void *buffer, size_t size) wxOutputStream& Write(const wxString& buffer, size_t size) ! wxOutputStream& Write(wxInputStream& stream_in) %endclass *************** *** 491,495 **** %class %noclassinfo wxFileInputStream, wxInputStream wxFileInputStream(const wxString& fileName) ! %constructor wxFileInputStreamFile(wxFile& file) //wxFileInputStream(int fd) --- 491,495 ---- %class %noclassinfo wxFileInputStream, wxInputStream wxFileInputStream(const wxString& fileName) ! wxFileInputStream(wxFile& file) //wxFileInputStream(int fd) *************** *** 502,506 **** %class %noclassinfo wxFileOutputStream, wxOutputStream wxFileOutputStream(const wxString& fileName) ! %constructor wxFileOutputStreamFile(wxFile& file) //wxFileOutputStream(int fd) --- 502,506 ---- %class %noclassinfo wxFileOutputStream, wxOutputStream wxFileOutputStream(const wxString& fileName) ! wxFileOutputStream(wxFile& file) //wxFileOutputStream(int fd) Index: regex.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** regex.i 23 Feb 2007 04:35:30 -0000 1.6 --- regex.i 31 May 2007 17:18:47 -0000 1.7 *************** *** 30,34 **** %class %delete %noclassinfo %encapsulate wxRegEx ! %constructor wxRegExDefault() wxRegEx(const wxString& expr, int flags = wxRE_DEFAULT) --- 30,34 ---- %class %delete %noclassinfo %encapsulate wxRegEx ! wxRegEx() wxRegEx(const wxString& expr, int flags = wxRE_DEFAULT) Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** dialogs.i 17 Mar 2007 19:08:09 -0000 1.27 --- dialogs.i 31 May 2007 17:18:46 -0000 1.28 *************** *** 60,64 **** %wxchkver_2_8&&wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent = NULL, const wxFont& fontInit = wxNullFont, const wxString& caption = "") // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! wxUSE_CHOICEDLG %function int wxGetMultipleChoices(const wxString& message, const wxString& caption, int n, const wxString choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) %if wxUSE_NUMBERDLG %wxchkver_2_5 %include "wx/numdlg.h" // FIXME not in 2.4 --- 60,66 ---- %wxchkver_2_8&&wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent = NULL, const wxFont& fontInit = wxNullFont, const wxString& caption = "") // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! // int wxGetMultipleChoices(const wxString& message, const wxString& caption, int n, const wxString choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! wxUSE_CHOICEDLG %function int wxGetMultipleChoices(const wxString& message, const wxString& caption, LuaTable strTable, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! %if wxUSE_NUMBERDLG %wxchkver_2_5 %include "wx/numdlg.h" // FIXME not in 2.4 *************** *** 90,95 **** %class wxDialog, wxTopLevelWindow wxDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "wxDialog") - %constructor wxEmptyDialog() void Centre(int direction = wxBOTH) --- 92,97 ---- %class wxDialog, wxTopLevelWindow + wxDialog() wxDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "wxDialog") void Centre(int direction = wxBOTH) *************** *** 114,119 **** bool Show(const bool show) int ShowModal() - - %property=ReturnCode, read, write %endclass --- 116,119 ---- *************** *** 203,208 **** wxColourData& GetColourData() //int ShowModal() - in wxDialog - - %property=ColourData, read %endclass --- 203,206 ---- *************** *** 214,218 **** %class %delete wxColourData, wxObject wxColourData() ! %constructor wxColourDataCopy(const wxColourData& cData) bool GetChooseFull() const --- 212,216 ---- %class %delete wxColourData, wxObject wxColourData() ! wxColourData(const wxColourData& cData) bool GetChooseFull() const *************** *** 222,228 **** void SetColour(wxColour &colour) void SetCustomColour(int i, wxColour &colour) - - %property=Colour, read, write - %property=ChooseFull, read, write %endclass --- 220,223 ---- *************** *** 237,243 **** %class wxFileDialog, wxDialog ! // %constructor wxFileDialogDefault() no default constructor in MSW ! !%wxchkver_2_8 wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition) ! %wxchkver_2_8 wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog") // since there's no default constructor in MSW you can't call this so it's best to not have it at all --- 232,238 ---- %class wxFileDialog, wxDialog ! // wxFileDialog() no default constructor in MSW ! %not_overload !%wxchkver_2_8 wxFileDialog(wxWindow* parent, const wxString& message = "Choose a file", const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildcard = "*.*", long style = 0, const wxPoint& pos = wxDefaultPosition) ! %not_overload %wxchkver_2_8 wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = wxFD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, const wxString& name = "wxFileDialog") // since there's no default constructor in MSW you can't call this so it's best to not have it at all *************** *** 246,255 **** wxString GetFilename() const // %override [lua string table] wxFileDialog::GetFilenames() ! void GetFilenames(wxArrayString& filenames) const int GetFilterIndex() const wxString GetMessage() const wxString GetPath() const // %override [lua string table] wxFileDialog::GetPaths() ! void GetPaths(wxArrayString& paths) const !%wxchkver_2_7 long GetStyle() const wxString GetWildcard() const --- 241,254 ---- wxString GetFilename() const // %override [lua string table] wxFileDialog::GetFilenames() ! // void GetFilenames(wxArrayString& filenames) const ! void GetFilenames() const ! int GetFilterIndex() const wxString GetMessage() const wxString GetPath() const // %override [lua string table] wxFileDialog::GetPaths() ! // void GetPaths(wxArrayString& paths) const ! void GetPaths() const ! !%wxchkver_2_7 long GetStyle() const wxString GetWildcard() const *************** *** 262,273 **** void SetWildcard(const wxString& wildCard) // int ShowModal() - in wxDialog - - %property=Directory, read, write - %property=Filename, read, write - %property=FilterIndex, read, write - %property=Message, read, write - %property=Path, read, write - !%wxchkver_2_7 %property=Style, read, write - %property=Wildcard, read, write %endclass --- 261,264 ---- *************** *** 296,303 **** !%wxchkver_2_7 void SetStyle(long style) // int ShowModal() - in wxDialog - - %property=Message, read, write - %property=Path, read, write - !%wxchkver_2_7 %property=Style, read, write %endclass --- 287,290 ---- *************** *** 348,354 **** void SetSelection(int selection) const // int ShowModal() - in wxDialog - - %property=StringSelection, read - %property=Selection, read, write %endclass --- 335,338 ---- *************** *** 368,373 **** void SetValue(const wxString& value) // int ShowModal() - in wxDialog - - %property=Value, read, write %endclass --- 352,355 ---- *************** *** 394,399 **** wxFontData& GetFontData() // int ShowModal() - in wxDialog - - %win %property=FontData, read %endclass --- 376,379 ---- *************** *** 405,409 **** %class %delete %noclassinfo wxFontData wxFontData() ! %constructor wxFontDataCopy(const wxFontData& data) void EnableEffects(bool enable) --- 385,389 ---- %class %delete %noclassinfo wxFontData wxFontData() ! wxFontData(const wxFontData& data) void EnableEffects(bool enable) *************** *** 420,428 **** void SetRange(int minimum, int maximum) void SetShowHelp(bool showHelp) - - %property=AllowSymbols, read, write - %property=C... [truncated message content] |
