Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32516/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i config.i controls.i data.i datetime.i defsutil.i dialogs.i event.i file.i gdi.i geometry.i grid.i help.i html.i image.i mdi.i menutool.i override.hpp picker.i print.i regex.i sizer.i socket.i thread.i wave.i windows.i wx_datatypes.lua wxlua.i xml.i Log Message: Add %gc, %ungc, %gc_this, and %ungc_this for fine tuning of tracking or releasing the garbage collection of userdata objects that become owned or released by something other than wxLua. Added %delete to many more classes using the above tags to control when and if they should be deleted. Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wave.i 18 Jun 2007 02:56:24 -0000 1.20 --- wave.i 25 Jun 2007 03:19:38 -0000 1.21 *************** *** 17,21 **** wxUSE_SOUND|(%msw&wxUSE_WAVE) %define wxSOUND_LOOP ! %if %wxchkver_2_6 & wxUSE_SOUND %include "wx/sound.h" --- 17,21 ---- wxUSE_SOUND|(%msw&wxUSE_WAVE) %define wxSOUND_LOOP ! %if %wxchkver_2_6 && wxUSE_SOUND %include "wx/sound.h" *************** *** 25,31 **** 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 --- 25,31 ---- 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 *************** *** 35,44 **** %endclass ! %endif // %wxchkver_2_6 & wxUSE_SOUND // --------------------------------------------------------------------------- // wxWave ! %if %msw & !%wxchkver_2_6 & wxUSE_WAVE %include "wx/wave.h" --- 35,44 ---- %endclass ! %endif // %wxchkver_2_6 && wxUSE_SOUND // --------------------------------------------------------------------------- // wxWave ! %if %msw && !%wxchkver_2_6 && wxUSE_WAVE %include "wx/wave.h" *************** *** 47,52 **** wxWave() wxWave(const wxString& fileName, bool isResource = false) - bool Create(const wxString& fileName, bool isResource = false) bool IsOk() const !%wxchkver_2_6 bool Play(bool async = true, bool looped = false) const --- 47,52 ---- wxWave() wxWave(const wxString& fileName, bool isResource = false) bool Create(const wxString& fileName, bool isResource = false) + bool IsOk() const !%wxchkver_2_6 bool Play(bool async = true, bool looped = false) const *************** *** 54,58 **** %endclass ! %endif // %msw & !%wxchkver_2_6 & wxUSE_WAVE %endif //wxLUA_USE_wxWave --- 54,58 ---- %endclass ! %endif // %msw && !%wxchkver_2_6 && wxUSE_WAVE %endif //wxLUA_USE_wxWave *************** *** 61,65 **** // wxMediaCtrl ! %if wxLUA_USE_wxMediaCtrl & wxUSE_MEDIACTRL %include "wx/mediactrl.h" --- 61,65 ---- // wxMediaCtrl ! %if wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL %include "wx/mediactrl.h" *************** *** 88,93 **** 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" ) - bool Create( 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" ) wxFileOffset GetDownloadProgress() // DirectShow only wxFileOffset GetDownloadTotal() // DirectShow only --- 88,93 ---- 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" ) bool Create( 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" ) + wxFileOffset GetDownloadProgress() // DirectShow only wxFileOffset GetDownloadTotal() // DirectShow only *************** *** 134,143 **** %endclass ! %endif //wxLUA_USE_wxMediaCtrl & wxUSE_MEDIACTRL // --------------------------------------------------------------------------- // wxJoystick ! %if wxLUA_USE_wxJoystick & wxUSE_JOYSTICK %include "wx/joystick.h" --- 134,143 ---- %endclass ! %endif //wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL // --------------------------------------------------------------------------- // wxJoystick ! %if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK %include "wx/joystick.h" *************** *** 228,231 **** %endclass ! %endif //wxLUA_USE_wxJoystick & wxUSE_JOYSTICK --- 228,231 ---- %endclass ! %endif //wxLUA_USE_wxJoystick && wxUSE_JOYSTICK Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** menutool.i 18 Jun 2007 02:56:24 -0000 1.22 --- menutool.i 25 Jun 2007 03:19:37 -0000 1.23 *************** *** 11,15 **** // wxMenu ! %if wxLUA_USE_wxMenu & wxUSE_MENUS %include "wx/menu.h" --- 11,15 ---- // wxMenu ! %if wxLUA_USE_wxMenu && wxUSE_MENUS %include "wx/menu.h" *************** *** 26,30 **** %define wxMENU_TEAROFF ! %class wxMenu, wxEvtHandler wxMenu(const wxString& title = "", long style = 0) --- 26,30 ---- %define wxMENU_TEAROFF ! %class %delete wxMenu, wxEvtHandler wxMenu(const wxString& title = "", long style = 0) *************** *** 34,39 **** 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 = "") --- 34,39 ---- wxMenuItem* Append(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! wxMenuItem* Append(int id, const wxString& item, %ungc wxMenu *subMenu, const wxString& helpString = "") ! wxMenuItem* Append(%ungc wxMenuItem* menuItem) wxMenuItem* AppendCheckItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* AppendRadioItem(int id, const wxString& item, const wxString& helpString = "") *************** *** 59,63 **** 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 = "") --- 59,63 ---- 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, %ungc 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 = "") *************** *** 66,75 **** 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) --- 66,75 ---- bool IsEnabled(int id) const wxMenuItem* Prepend(int id, const wxString& item, const wxString& helpString = "", wxItemKind kind = wxITEM_NORMAL) ! wxMenuItem* Prepend(%ungc wxMenuItem *item) wxMenuItem* PrependCheckItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* PrependRadioItem(int id, const wxString& item, const wxString& helpString = "") wxMenuItem* PrependSeparator() ! %gc wxMenuItem* Remove(wxMenuItem *item) ! %gc wxMenuItem* Remove(int id) void SetHelpString(int id, const wxString& helpString) void SetLabel(int id, const wxString& label) *************** *** 85,89 **** // void wxMenuBar(int n, wxMenu* menus[], const wxString titles[]) ! bool Append(wxMenu *menu, const wxString& title) void Check(int id, bool check) void Enable(int id, bool enable) --- 85,89 ---- // void wxMenuBar(int n, wxMenu* menus[], const wxString titles[]) ! bool Append(%ungc wxMenu *menu, const wxString& title) void Check(int id, bool check) void Enable(int id, bool enable) *************** *** 97,106 **** wxMenu* GetMenu(int menuIndex) const int GetMenuCount() const ! bool Insert(size_t pos, wxMenu *menu, const wxString& title) bool IsChecked(int id) const bool IsEnabled(int id) const void Refresh() ! wxMenu* Remove(size_t pos) ! wxMenu* Replace(size_t pos, wxMenu *menu, const wxString& title) void SetHelpString(int id, const wxString& helpString) void SetLabel(int id, const wxString& label) --- 97,106 ---- wxMenu* GetMenu(int menuIndex) const int GetMenuCount() const ! bool Insert(size_t pos, %ungc wxMenu *menu, const wxString& title) bool IsChecked(int id) const bool IsEnabled(int id) const void Refresh() ! %gc wxMenu* Remove(size_t pos) ! %gc wxMenu* Replace(size_t pos, %ungc wxMenu *menu, const wxString& title) void SetHelpString(int id, const wxString& helpString) void SetLabel(int id, const wxString& label) *************** *** 112,120 **** // --------------------------------------------------------------------------- // wxMenuItem %include "wx/menuitem.h" ! %class wxMenuItem, wxObject ! wxMenuItem(wxMenu *parentMenu = NULL, int id = wxID_SEPARATOR, const wxString& text = "", const wxString& help = "", wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = NULL) void Check(bool check) --- 112,124 ---- // --------------------------------------------------------------------------- // wxMenuItem + // + // Note: this is almost always owned by a wxMenu, however you can get an + // unattached one from wxMenu::Remove() so that's why we gc collect it. + %include "wx/menuitem.h" ! %class %delete wxMenuItem, wxObject ! %ungc_this wxMenuItem(wxMenu *parentMenu = NULL, int id = wxID_SEPARATOR, const wxString& text = "", const wxString& help = "", wxItemKind kind = wxITEM_NORMAL, wxMenu *subMenu = NULL) void Check(bool check) *************** *** 145,149 **** void SetHelp(const wxString& helpString) const //%win void SetMarginWidth(int width) const ! void SetMenu(wxMenu* menu) void SetSubMenu(wxMenu* menu) void SetText(const wxString& text) --- 149,153 ---- void SetHelp(const wxString& helpString) const //%win void SetMarginWidth(int width) const ! //void SetMenu(wxMenu* menu) void SetSubMenu(wxMenu* menu) void SetText(const wxString& text) *************** *** 178,182 **** %endclass ! %endif //wxLUA_USE_wxMenu & wxUSE_MENUS // --------------------------------------------------------------------------- --- 182,186 ---- %endclass ! %endif //wxLUA_USE_wxMenu && wxUSE_MENUS // --------------------------------------------------------------------------- *************** *** 206,210 **** 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) --- 210,214 ---- 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) *************** *** 233,237 **** 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() --- 237,241 ---- 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() *************** *** 258,263 **** 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") %endclass --- 262,267 ---- 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") %endclass *************** *** 272,278 **** 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) %endclass --- 276,281 ---- 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) %endclass Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** clipdrag.i 18 Jun 2007 02:56:23 -0000 1.29 --- clipdrag.i 25 Jun 2007 03:19:37 -0000 1.30 *************** *** 11,15 **** // wxClipboard ! %if wxLUA_USE_wxClipboard & wxUSE_CLIPBOARD %include "wx/clipbrd.h" --- 11,15 ---- // wxClipboard ! %if wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD %include "wx/clipbrd.h" *************** *** 19,25 **** %wxchkver_2_6 static wxClipboard *Get() ! // wxClipboard() use global clipboard only ! bool AddData( wxDataObject *data ) void Clear() void Close() --- 19,25 ---- %wxchkver_2_6 static wxClipboard *Get() ! // No constructor, use global clipboard from static Get() function only ! bool AddData( %ungc wxDataObject *data ) void Clear() void Close() *************** *** 29,33 **** bool IsSupported( const wxDataFormat& format ) bool Open() ! bool SetData( wxDataObject *data ) void UsePrimarySelection( bool primary = true ) %endclass --- 29,33 ---- bool IsSupported( const wxDataFormat& format ) bool Open() ! bool SetData( %ungc wxDataObject *data ) void UsePrimarySelection( bool primary = true ) %endclass *************** *** 58,67 **** %endif //%wxchkver_2_8 ! %endif //wxLUA_USE_wxClipboard & wxUSE_CLIPBOARD // --------------------------------------------------------------------------- // wxDataFormat ! %if wxLUA_USE_wxDataObject & wxUSE_DATAOBJ %include "wx/dataobj.h" --- 58,67 ---- %endif //%wxchkver_2_8 ! %endif //wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD // --------------------------------------------------------------------------- // wxDataFormat ! %if wxLUA_USE_wxDataObject && wxUSE_DATAOBJ %include "wx/dataobj.h" *************** *** 159,163 **** wxDataObjectComposite() ! void Add(wxDataObjectSimple *dataObject, bool preferred = false) %wxchkver_2_8 wxDataFormat GetReceivedFormat() const %endclass --- 159,163 ---- wxDataObjectComposite() ! void Add(%ungc wxDataObjectSimple *dataObject, bool preferred = false) %wxchkver_2_8 wxDataFormat GetReceivedFormat() const %endclass *************** *** 176,180 **** // wxTextDataObject ! %class %noclassinfo %encapsulate wxTextDataObject, wxDataObjectSimple wxTextDataObject(const wxString& text = "") --- 176,180 ---- // wxTextDataObject ! %class %delete %noclassinfo %encapsulate wxTextDataObject, wxDataObjectSimple wxTextDataObject(const wxString& text = "") *************** *** 187,191 **** // wxBitmapDataObject ! %class %noclassinfo %encapsulate wxBitmapDataObject, wxDataObjectSimple wxBitmapDataObject(const wxBitmap& bitmap = wxNullBitmap) --- 187,191 ---- // wxBitmapDataObject ! %class %delete %noclassinfo %encapsulate wxBitmapDataObject, wxDataObjectSimple wxBitmapDataObject(const wxBitmap& bitmap = wxNullBitmap) *************** *** 195,199 **** // --------------------------------------------------------------------------- ! // wxCustomDataObject //%class %noclassinfo %encapsulate wxCustomDataObject, wxDataObjectSimple --- 195,199 ---- // --------------------------------------------------------------------------- ! // wxCustomDataObject - FIXME implement this? //%class %noclassinfo %encapsulate wxCustomDataObject, wxDataObjectSimple *************** *** 213,217 **** %if %wxchkver_2_8 ! %class %noclassinfo %encapsulate wxURLDataObject, wxTextDataObject wxURLDataObject(const wxString& url = "") --- 213,217 ---- %if %wxchkver_2_8 ! %class %delete %noclassinfo %encapsulate wxURLDataObject, wxTextDataObject wxURLDataObject(const wxString& url = "") *************** *** 222,231 **** %endif //%wxchkver_2_8 ! %endif //wxLUA_USE_wxDataObject & wxUSE_DATAOBJ // --------------------------------------------------------------------------- // wxDropTarget ! %if wxLUA_USE_wxDragDrop & wxUSE_DRAG_AND_DROP %include "wx/dnd.h" --- 222,231 ---- %endif //%wxchkver_2_8 ! %endif //wxLUA_USE_wxDataObject && wxUSE_DATAOBJ // --------------------------------------------------------------------------- // wxDropTarget ! %if wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP %include "wx/dnd.h" *************** *** 315,324 **** %endclass ! %endif //wxLUA_USE_wxDragDrop & wxUSE_DRAG_AND_DROP // --------------------------------------------------------------------------- // wxMetafile ! %if wxLUA_USE_wxMetafile & wxUSE_METAFILE & (%msw|%mac|%os2) %include "wx/metafile.h" --- 315,324 ---- %endclass ! %endif //wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP // --------------------------------------------------------------------------- // wxMetafile ! %if wxLUA_USE_wxMetafile && wxUSE_METAFILE && (%msw|%mac|%os2) %include "wx/metafile.h" *************** *** 326,330 **** //%function bool wxMakeMetafilePlaceable(const wxString& filename, int minX, int minY, int maxX, int maxY, float scale = 1.0) ! %class %noclassinfo wxMetafile, wxObject wxMetafile(const wxString& filename = "") --- 326,330 ---- //%function bool wxMakeMetafilePlaceable(const wxString& filename, int minX, int minY, int maxX, int maxY, float scale = 1.0) ! %class %delete %noclassinfo wxMetafile, wxObject wxMetafile(const wxString& filename = "") *************** *** 339,346 **** wxMetafileDC(const wxString& filename = "") ! %win wxMetafile* Close() %endclass %endif ! %endif //wxLUA_USE_wxMetafile & wxUSE_METAFILE & (%msw|%mac|%os2) --- 339,346 ---- wxMetafileDC(const wxString& filename = "") ! %win %gc wxMetafile* Close() %endclass %endif ! %endif //wxLUA_USE_wxMetafile && wxUSE_METAFILE && (%msw|%mac|%os2) Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** data.i 18 Jun 2007 19:51:26 -0000 1.36 --- data.i 25 Jun 2007 03:19:37 -0000 1.37 *************** *** 14,18 **** // functions that return wxStrings actually return lua strings. ! %class %noclassinfo %encapsulate wxString wxString(const wxString& str = "") --- 14,18 ---- // functions that return wxStrings actually return lua strings. ! %class %delete %noclassinfo %encapsulate wxString wxString(const wxString& str = "") *************** *** 56,59 **** --- 56,62 ---- // --------------------------------------------------------------------------- // wxClientData + // + // No %delete since the container will delete it and you should only create one + // of these if you plan on attaching it to a container to avoid a memory leak. //%enum wxClientDataType - used internally so we don't need it *************** *** 70,73 **** --- 73,79 ---- // --------------------------------------------------------------------------- // wxStringClientData + // + // No %delete since the container will delete it and you should only create one + // of these if you plan on attaching it to a container to avoid a memory leak. %class %noclassinfo wxStringClientData, wxClientData *************** *** 99,103 **** %include "wx/object.h" ! %function wxObject * wxCreateDynamicObject(const wxString& className) %class %delete wxObject --- 105,109 ---- %include "wx/object.h" ! %function wxObject* wxCreateDynamicObject(const wxString& className) %class %delete wxObject *************** *** 119,123 **** %endclass ! %class %noclassinfo wxObjectRefData int GetRefCount() const %endclass --- 125,129 ---- %endclass ! %class %noclassinfo wxObjectRefData // no %delete since this should be from a wxObject int GetRefCount() const %endclass *************** *** 132,136 **** %include "wx/object.h" ! %class %noclassinfo wxClassInfo // %override wxClassInfo() constructor creates an instance using wxClassInfo::FindClass wxClassInfo(const wxString &name) --- 138,142 ---- %include "wx/object.h" ! %class %noclassinfo wxClassInfo // no %delete since we're always getting a static instance // %override wxClassInfo() constructor creates an instance using wxClassInfo::FindClass wxClassInfo(const wxString &name) *************** *** 157,161 **** // wxValidator ! %if wxLUA_USE_wxValidator & wxUSE_VALIDATORS %include "wx/validate.h" --- 163,167 ---- // wxValidator ! %if wxLUA_USE_wxValidator && wxUSE_VALIDATORS %include "wx/validate.h" *************** *** 245,254 **** %endif //wxLUA_USE_wxGenericValidator ! %endif //wxLUA_USE_wxValidator & wxUSE_VALIDATORS // --------------------------------------------------------------------------- // wxList ! %if wxLUA_USE_wxList & !wxUSE_STL %include "wx/list.h" --- 251,260 ---- %endif //wxLUA_USE_wxGenericValidator ! %endif //wxLUA_USE_wxValidator && wxUSE_VALIDATORS // --------------------------------------------------------------------------- // wxList ! %if wxLUA_USE_wxList && !wxUSE_STL %include "wx/list.h" *************** *** 260,264 **** %endenum ! %class wxList, wxObject wxList() --- 266,270 ---- %endenum ! %class %delete wxList, wxObject wxList() *************** *** 288,292 **** // wxNode - wxList ! %class %noclassinfo wxNode // no constructor, just use this from a wxList --- 294,298 ---- // wxNode - wxList ! %class %noclassinfo wxNode // no %delete since we get this from a wxList // no constructor, just use this from a wxList *************** *** 315,322 **** %endclass ! %endif //wxLUA_USE_wxList & !wxUSE_STL // --------------------------------------------------------------------------- ! // wxArray - can't implement is not really a class, here's the list of generic functions //%class %noclassinfo wxArray --- 321,329 ---- %endclass ! %endif //wxLUA_USE_wxList && !wxUSE_STL // --------------------------------------------------------------------------- ! // wxArray - Can't implement this since it's not really a class. ! // Here's the list of generic functions. //%class %noclassinfo wxArray *************** *** 356,362 **** int GetCount() const bool IsEmpty() const ! int Index(int n, bool searchFromEnd = false) void Insert( int num, int n, int copies = 1 ) ! int Item( int n ) void Remove(int n) void RemoveAt(size_t index) --- 363,369 ---- int GetCount() const bool IsEmpty() const ! int Index(int n, bool searchFromEnd = false) void Insert( int num, int n, int copies = 1 ) ! int Item( int n ) void Remove(int n) void RemoveAt(size_t index) *************** *** 387,392 **** void Clear() void Empty() ! int GetCount() const ! int Index(const wxString &sz, bool bCase = true, bool bFromEnd = false) void Insert(const wxString& str, int nIndex, size_t copies = 1) bool IsEmpty() --- 394,399 ---- void Clear() void Empty() ! int GetCount() const ! int Index(const wxString &sz, bool bCase = true, bool bFromEnd = false) void Insert(const wxString& str, int nIndex, size_t copies = 1) bool IsEmpty() *************** *** 410,414 **** %class %delete %noclassinfo %encapsulate wxSortedArrayString, wxArrayString wxSortedArrayString() ! wxSortedArrayString(const wxArrayString& src) // have to have this constructor since they're not derived wxSortedArrayString(const wxSortedArrayString& src) --- 417,421 ---- %class %delete %noclassinfo %encapsulate wxSortedArrayString, wxArrayString wxSortedArrayString() ! wxSortedArrayString(const wxArrayString& src) // have to have this constructor since they're not actually derived wxSortedArrayString(const wxSortedArrayString& src) *************** *** 457,461 **** // %wxchkver_2_6 wxHashTable::Node * Next() // void Put(long key, wxObject *object) ! // void Put(const wxString & key, wxObject *object) // int GetCount() const //%endclass --- 464,468 ---- // %wxchkver_2_6 wxHashTable::Node * Next() // void Put(long key, wxObject *object) ! // void Put(const wxString& key, wxObject *object) // int GetCount() const //%endclass *************** *** 464,469 **** // --------------------------------------------------------------------------- ! // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong ! // Works in GCC %if wxUSE_LONGLONG --- 471,475 ---- // --------------------------------------------------------------------------- ! // wxLongLong %if wxUSE_LONGLONG *************** *** 471,475 **** %include "wx/longlong.h" ! %class %encapsulate %delete %noclassinfo wxLongLong wxLongLong(long hi = 0, unsigned long lo = 0) --- 477,481 ---- %include "wx/longlong.h" ! %class %delete %encapsulate %noclassinfo wxLongLong wxLongLong(long hi = 0, unsigned long lo = 0) *************** *** 492,496 **** // wxULongLong ! %class %encapsulate %delete %noclassinfo wxULongLong wxULongLong(unsigned long hi = 0, unsigned long lo = 0) --- 498,502 ---- // wxULongLong ! %class %delete %encapsulate %noclassinfo wxULongLong wxULongLong(unsigned long hi = 0, unsigned long lo = 0) Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** wx_datatypes.lua 20 Jun 2007 22:57:34 -0000 1.76 --- wx_datatypes.lua 25 Jun 2007 03:19:38 -0000 1.77 *************** *** 284,294 **** Name = "wxArrayString", }, - wxArrayTreeItemIds = { - Condition = "wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL", - DefType = "class", - Encapsulate = true, - IsNumber = false, - Name = "wxArrayTreeItemIds", - }, wxArrayVideoModes = { Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY", --- 284,287 ---- *************** *** 501,504 **** --- 494,498 ---- Condition = "wxLUA_USE_wxCaret && wxUSE_CARET", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxCaret", *************** *** 693,696 **** --- 687,691 ---- Condition = "wxLUA_USE_wxConfig && wxUSE_CONFIG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxConfig", *************** *** 699,702 **** --- 694,698 ---- Condition = "wxLUA_USE_wxConfig && wxUSE_CONFIG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxConfigBase", *************** *** 804,807 **** --- 800,804 ---- Condition = "wxUSE_STREAMS", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDataInputStream", *************** *** 838,841 **** --- 835,839 ---- Condition = "wxUSE_STREAMS", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDataOutputStream", *************** *** 1142,1145 **** --- 1140,1144 ---- Condition = "wxLUA_USE_wxConfig && wxUSE_CONFIG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxFileConfig", *************** *** 1185,1188 **** --- 1184,1188 ---- Condition = "wxUSE_STREAMS", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxFileInputStream", *************** *** 1210,1213 **** --- 1210,1214 ---- Condition = "wxUSE_STREAMS", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxFileOutputStream", *************** *** 1246,1249 **** --- 1247,1251 ---- }, wxFindReplaceData = { + BaseClass = "wxObject", Condition = "wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog", DefType = "class", *************** *** 1671,1674 **** --- 1673,1677 ---- Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxGridTableMessage", *************** *** 2243,2246 **** --- 2246,2250 ---- }, wxLogNull = { + BaseClass = "wxLog", Condition = "wxUSE_LOG", DefType = "class", *************** *** 2361,2364 **** --- 2365,2369 ---- Condition = "wxLUA_USE_wxConfig && wxUSE_CONFIG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxMemoryConfig", *************** *** 2699,2703 **** wxPlatformInfo = { DefType = "class", - Encapsulate = true, IsNumber = false, Name = "wxPlatformInfo", --- 2704,2707 ---- *************** *** 3255,3259 **** Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxStandardPaths", DefType = "class", - Encapsulate = true, IsNumber = false, Name = "wxStandardPaths", --- 3259,3262 ---- *************** *** 3635,3644 **** Name = "wxTreeEvent", }, - wxTreeItemAttr = { - Condition = "wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL", - DefType = "class", - IsNumber = false, - Name = "wxTreeItemAttr", - }, wxTreeItemData = { BaseClass = "wxClientData", --- 3638,3641 ---- *************** *** 3793,3796 **** --- 3790,3794 ---- wxVisualAttributes = { DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxVisualAttributes", Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** print.i 18 Jun 2007 02:56:24 -0000 1.20 --- print.i 25 Jun 2007 03:19:38 -0000 1.21 *************** *** 8,12 **** // =========================================================================== ! %if wxLUA_USE_wxPrint & wxUSE_PRINTING_ARCHITECTURE %typedef wxPreviewWindow wxScrolledWindow --- 8,12 ---- // =========================================================================== ! %if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE %typedef wxPreviewWindow wxScrolledWindow *************** *** 533,536 **** %endif // %msw|%mac ! %endif //wxLUA_USE_wxPrint & wxUSE_PRINTING_ARCHITECTURE --- 533,536 ---- %endif // %msw|%mac ! %endif //wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** file.i 18 Jun 2007 02:56:24 -0000 1.26 --- file.i 25 Jun 2007 03:19:37 -0000 1.27 *************** *** 159,162 **** --- 159,163 ---- void Clear() void ClearExt() + // Use AssignTempFileName(...) equivalents //!%wxchkver_2_8 static wxString CreateTempFileName(const wxString& prefix, wxFile *fileTemp = NULL) *************** *** 164,167 **** --- 165,169 ---- //%wxchkver_2_8&&wxUSE_FILE static wxString CreateTempFileName(const wxString& prefix, wxFile *fileTemp) //%wxchkver_2_8&&wxUSE_FFILE static wxString CreateTempFileName(const wxString& prefix, wxFFile *fileTemp); + bool DirExists() static bool DirExists(const wxString& dir) *************** *** 194,199 **** static wxString GetPathTerminators(wxPathFormat format = wxPATH_NATIVE) wxString GetShortPath() const ! %wxchkver_2_8 wxULongLong GetSize() const ! //%wxchkver_2_8 static wxULongLong GetSize(const wxString &file) // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes() --- 196,204 ---- static wxString GetPathTerminators(wxPathFormat format = wxPATH_NATIVE) wxString GetShortPath() const ! ! %if %wxchkver_2_8 ! wxULongLong GetSize() const ! static wxULongLong GetSize(const wxString &file) ! %endif // %wxchkver_2_8 // %override [bool, wxDateTime dtAccess, wxDateTime dtMod, wxDateTime dtCreate] wxFileName::GetTimes() *************** *** 213,226 **** bool IsRelative(wxPathFormat format = wxPATH_NATIVE) bool IsDir() const ! %wxchkver_2_8 bool IsDirWritable() const ! //%wxchkver_2_8 static bool IsDirWritable(const wxString &path) ! %wxchkver_2_8 bool IsDirReadable() const ! //%wxchkver_2_8 static bool IsDirReadable(const wxString &path) ! %wxchkver_2_8 bool IsFileWritable() const ! //%wxchkver_2_8 static bool IsFileWritable(const wxString &path) ! %wxchkver_2_8 bool IsFileReadable() const ! //%wxchkver_2_8 static bool IsFileReadable(const wxString &path) ! %wxchkver_2_8 bool IsFileExecutable() const ! //%wxchkver_2_8 static bool IsFileExecutable(const wxString &path) //static bool MacFindDefaultTypeAndCreator(const wxString& ext, wxUint32* type, wxUint32* creator) //bool MacSetDefaultTypeAndCreator() --- 218,235 ---- bool IsRelative(wxPathFormat format = wxPATH_NATIVE) bool IsDir() const ! ! %if %wxchkver_2_8 ! bool IsDirWritable() const ! static bool IsDirWritable(const wxString &path) ! bool IsDirReadable() const ! static bool IsDirReadable(const wxString &path) ! bool IsFileWritable() const ! static bool IsFileWritable(const wxString &path) ! bool IsFileReadable() const ! static bool IsFileReadable(const wxString &path) ! bool IsFileExecutable() const ! static bool IsFileExecutable(const wxString &path) ! %endif // %wxchkver_2_8 ! //static bool MacFindDefaultTypeAndCreator(const wxString& ext, wxUint32* type, wxUint32* creator) //bool MacSetDefaultTypeAndCreator() *************** *** 267,271 **** // wxFile ! %if wxLUA_USE_wxFile & wxUSE_FILE %include "wx/file.h" --- 276,280 ---- // wxFile ! %if wxLUA_USE_wxFile && wxUSE_FILE %include "wx/file.h" *************** *** 349,353 **** %include "wx/file.h" ! %class %noclassinfo %encapsulate %delete wxTempFile wxTempFile() // associates the temp file with the file to be replaced and opens it --- 358,362 ---- %include "wx/file.h" ! %class %delete %noclassinfo %encapsulate wxTempFile wxTempFile() // associates the temp file with the file to be replaced and opens it *************** *** 377,381 **** %endclass ! %endif //wxLUA_USE_wxFile & wxUSE_FILE // --------------------------------------------------------------------------- --- 386,390 ---- %endclass ! %endif //wxLUA_USE_wxFile && wxUSE_FILE // --------------------------------------------------------------------------- *************** *** 417,422 **** bool Open(const wxString& dir) ! %wxchkver_2_8 static wxString FindFirst(const wxString& dirname, const wxString& filespec, int flags = wxDIR_DEFAULT) ! %wxchkver_2_8 static wxULongLong GetTotalSize(const wxString &dir) //, wxArrayString *filesSkipped = NULL) FIXME override // We don't need wxDirTraverser, just use wxDir methods GetFirst, GetNext. --- 426,433 ---- bool Open(const wxString& dir) ! %if %wxchkver_2_8 ! static wxString FindFirst(const wxString& dirname, const wxString& filespec, int flags = wxDIR_DEFAULT) ! static wxULongLong GetTotalSize(const wxString &dir) //, wxArrayString *filesSkipped = NULL) FIXME override ! %endif // %wxchkver_2_8 // We don't need wxDirTraverser, just use wxDir methods GetFirst, GetNext. *************** *** 647,651 **** %class %noclassinfo wxOutputStream, wxStreamBase ! // wxOutputStream() this os only a base class bool Close() --- 658,662 ---- %class %noclassinfo wxOutputStream, wxStreamBase ! // wxOutputStream() this is only a base class bool Close() *************** *** 667,671 **** %include "wx/wfstream.h" ! %class %noclassinfo wxFileInputStream, wxInputStream wxFileInputStream(const wxString& fileName) wxFileInputStream(wxFile& file) --- 678,682 ---- %include "wx/wfstream.h" ! %class %delete %noclassinfo %encapsulate wxFileInputStream, wxInputStream wxFileInputStream(const wxString& fileName) wxFileInputStream(wxFile& file) *************** *** 678,682 **** // wxFileOutputStream ! %class %noclassinfo wxFileOutputStream, wxOutputStream wxFileOutputStream(const wxString& fileName) wxFileOutputStream(wxFile& file) --- 689,693 ---- // wxFileOutputStream ! %class %delete %noclassinfo %encapsulate wxFileOutputStream, wxOutputStream wxFileOutputStream(const wxString& fileName) wxFileOutputStream(wxFile& file) *************** *** 691,701 **** %include "wx/datstrm.h" ! %class %noclassinfo wxDataInputStream ! //%if wxUSE_UNICODE ! // wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto()); ! //%endif // wxUSE_UNICODE ! //%if !wxUSE_UNICODE wxDataInputStream(wxInputStream& s) - //%endif // !wxUSE_UNICODE bool IsOk() --- 702,708 ---- %include "wx/datstrm.h" ! %class %delete %noclassinfo %encapsulate wxDataInputStream ! // wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto()); wxDataInputStream(wxInputStream& s) bool IsOk() *************** *** 738,747 **** %include "wx/datstrm.h" ! %class %noclassinfo wxDataOutputStream ! //#if wxUSE_UNICODE ! // wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto()); ! //#else wxDataOutputStream(wxOutputStream& s); - //#endif bool IsOk() --- 745,751 ---- %include "wx/datstrm.h" ! %class %delete %noclassinfo %encapsulate wxDataOutputStream ! // wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto()); wxDataOutputStream(wxOutputStream& s); bool IsOk() Index: regex.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** regex.i 17 Jun 2007 17:17:37 -0000 1.10 --- regex.i 25 Jun 2007 03:19:38 -0000 1.11 *************** *** 11,15 **** // wxRegEx - Regular expression support ! %if wxLUA_USE_wxRegEx & wxUSE_REGEX %include "wx/regex.h" --- 11,15 ---- // wxRegEx - Regular expression support ! %if wxLUA_USE_wxRegEx && wxUSE_REGEX %include "wx/regex.h" *************** *** 59,62 **** %endclass ! %endif //wxLUA_USE_wxRegEx & wxUSE_REGEX --- 59,62 ---- %endclass ! %endif //wxLUA_USE_wxRegEx && wxUSE_REGEX Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** dialogs.i 19 Jun 2007 22:26:46 -0000 1.36 --- dialogs.i 25 Jun 2007 03:19:37 -0000 1.37 *************** *** 95,103 **** 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) - see wxWindow - bool Create(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "wxDialog") wxUSE_BUTTON wxSizer* CreateButtonSizer(long flags) ! %wxchkver_2_8&wxUSE_BUTTON wxSizer *CreateSeparatedButtonSizer(long flags) wxUSE_BUTTON wxStdDialogButtonSizer* CreateStdDialogButtonSizer(long flags) wxUSE_STATTEXT wxSizer *CreateTextSizer( const wxString &message ) --- 95,103 ---- 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") + bool Create(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) - see wxWindow wxUSE_BUTTON wxSizer* CreateButtonSizer(long flags) ! %wxchkver_2_8&&wxUSE_BUTTON wxSizer *CreateSeparatedButtonSizer(long flags) wxUSE_BUTTON wxStdDialogButtonSizer* CreateStdDialogButtonSizer(long flags) wxUSE_STATTEXT wxSizer *CreateTextSizer( const wxString &message ) *************** *** 124,132 **** // wxAboutDialog ! %if %wxchkver_2_8 & wxUSE_ABOUTDLG & wxLUA_USE_wxAboutDialog %include "wx/aboutdlg.h" ! %class %noclassinfo %encapsulate %delete wxAboutDialogInfo wxAboutDialogInfo() --- 124,132 ---- // wxAboutDialog ! %if %wxchkver_2_8 && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog %include "wx/aboutdlg.h" ! %class %delete %noclassinfo %encapsulate wxAboutDialogInfo wxAboutDialogInfo() *************** *** 189,198 **** %function void wxAboutBox(const wxAboutDialogInfo& info) ! %endif //%wxchkver_2_8 & wxUSE_ABOUTDLG & wxLUA_USE_wxAboutDialog // --------------------------------------------------------------------------- // wxColourDialog ! %if wxLUA_USE_wxColourDialog & wxUSE_COLOURDLG %include "wx/colordlg.h" --- 189,198 ---- %function void wxAboutBox(const wxAboutDialogInfo& info) ! %endif //%wxchkver_2_8 && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog // --------------------------------------------------------------------------- // wxColourDialog ! %if wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG %include "wx/colordlg.h" *************** *** 223,232 **** %endclass ! %endif // wxLUA_USE_wxColourDialog & wxUSE_COLOURDLG // --------------------------------------------------------------------------- // wxFileDialog ! %if wxLUA_USE_wxFileDialog & wxUSE_FILEDLG %include "wx/filedlg.h" --- 223,232 ---- %endclass ! %endif // wxLUA_USE_wxColourDialog && wxUSE_COLOURDLG // --------------------------------------------------------------------------- // wxFileDialog ! %if wxLUA_USE_wxFileDialog && wxUSE_FILEDLG %include "wx/filedlg.h" *************** *** 239,245 **** %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 //%wxchkver_2_8 bool Create(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") wxString GetDirectory() const wxString GetFilename() const --- 239,244 ---- %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") //%wxchkver_2_8 bool Create(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") + wxString GetDirectory() const wxString GetFilename() const *************** *** 269,278 **** %endclass ! %endif //wxLUA_USE_wxFileDialog & wxUSE_FILEDLG // --------------------------------------------------------------------------- // wxDirDialog ! %if wxLUA_USE_wxDirDialog & wxUSE_DIRDLG %include "wx/dirdlg.h" --- 268,277 ---- %endclass ! %endif //wxLUA_USE_wxFileDialog && wxUSE_FILEDLG // --------------------------------------------------------------------------- // wxDirDialog ! %if wxLUA_USE_wxDirDialog && wxUSE_DIRDLG %include "wx/dirdlg.h" *************** *** 295,307 **** %endclass ! %endif //wxLUA_USE_wxDirDialog & wxUSE_DIRDLG // --------------------------------------------------------------------------- // wxMessageDialog ! %if wxLUA_USE_wxMessageDialog & wxUSE_MSGDLG ! ! //%win %class wxMessageDialog, wxDialog FIXME need this for < 2.6 does 2.4 have it? ! //%gtk|%mac %class %noclassinfo wxMessageDialog, wxDialog %class wxMessageDialog, wxDialog --- 294,303 ---- %endclass ! %endif //wxLUA_USE_wxDirDialog && wxUSE_DIRDLG // --------------------------------------------------------------------------- // wxMessageDialog ! %if wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG %class wxMessageDialog, wxDialog *************** *** 311,320 **** %endclass ! %endif //wxLUA_USE_wxMessageDialog & wxUSE_MSGDLG // --------------------------------------------------------------------------- // wxMultiChoiceDialog - use wxGetMultipleChoices ! %if wxUSE_CHOICEDLG & wxLUA_USE_wxMultiChoiceDialog %class wxMultiChoiceDialog, wxDialog --- 307,316 ---- %endclass ! %endif //wxLUA_USE_wxMessageDialog && wxUSE_MSGDLG // --------------------------------------------------------------------------- // wxMultiChoiceDialog - use wxGetMultipleChoices ! %if wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog %class wxMultiChoiceDialog, wxDialog *************** *** 326,340 **** %endclass ! %endif //wxUSE_CHOICEDLG & wxLUA_USE_wxMultiChoiceDialog // --------------------------------------------------------------------------- // wxSingleChoiceDialog - use wxGetSingleChoice or wxGetSingleChoiceIndex ! %if wxUSE_CHOICEDLG & wxLUA_USE_wxSingleChoiceDialog %class wxSingleChoiceDialog, wxDialog ! // %override wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) ! // C++ Func: wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) ! wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) int GetSelection() const --- 322,336 ---- %endclass ! %endif //wxUSE_CHOICEDLG && wxLUA_USE_wxMultiChoiceDialog // --------------------------------------------------------------------------- // wxSingleChoiceDialog - use wxGetSingleChoice or wxGetSingleChoiceIndex ! %if wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog %class wxSingleChoiceDialog, wxDialog ! // %override wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) ! // C++ Func: wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) ! wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) int GetSelection() const *************** *** 344,353 **** %endclass ! %endif //wxUSE_CHOICEDLG & wxLUA_USE_wxSingleChoiceDialog // --------------------------------------------------------------------------- // wxTextEntryDialog - see also wxGetTextFromUser ! %if wxUSE_TEXTDLG & wxLUA_USE_wxTextEntryDialog %define wxTextEntryDialogStyle --- 340,349 ---- %endclass ! %endif //wxUSE_CHOICEDLG && wxLUA_USE_wxSingleChoiceDialog // --------------------------------------------------------------------------- // wxTextEntryDialog - see also wxGetTextFromUser ! %if wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog %define wxTextEntryDialogStyle *************** *** 364,367 **** --- 360,366 ---- // wxPasswordEntryDialog - see also wxGetPasswordFromUser + %define_string wxGetPasswordFromUserPromptStr + %define wxTextEntryDialogStyle + %class wxPasswordEntryDialog, wxTextEntryDialog wxPasswordEntryDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxGetPasswordFromUserPromptStr, const wxString& value = "", long style = wxTextEntryDialogStyle, const wxPoint& pos = wxDefaultPosition) *************** *** 369,378 **** %endclass ! %endif //wxUSE_TEXTDLG & wxLUA_USE_wxTextEntryDialog // --------------------------------------------------------------------------- // wxFontDialog ! %if wxUSE_FONTDLG & wxLUA_USE_wxFontDialog %include "wx/fontdlg.h" --- 368,377 ---- %endclass ! %endif //wxUSE_TEXTDLG && wxLUA_USE_wxTextEntryDialog // --------------------------------------------------------------------------- // wxFontDialog ! %if wxUSE_FONTDLG && wxLUA_USE_wxFontDialog %include "wx/fontdlg.h" *************** *** 409,418 **** %endclass ! %endif //wxUSE_FONTDLG & wxLUA_USE_wxFontDialog // --------------------------------------------------------------------------- // wxFindReplaceDialog ! %if wxUSE_FINDREPLDLG & wxLUA_USE_wxFindReplaceDialog %include "wx/fdrepdlg.h" --- 408,417 ---- %endclass ! %endif //wxUSE_FONTDLG && wxLUA_USE_wxFontDialog // --------------------------------------------------------------------------- // wxFindReplaceDialog ! %if wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog %include "wx/fdrepdlg.h" *************** *** 428,433 **** wxFindReplaceDialog() wxFindReplaceDialog(wxWindow *parent, wxFindReplaceData *findData, const wxString &title, int style = 0) - bool Create(wxWindow *parent, wxFindReplaceData *findData, const wxString &title, int style = 0) const wxFindReplaceData *GetData() void SetData(wxFindReplaceData *findData) --- 427,432 ---- wxFindReplaceDialog() wxFindReplaceDialog(wxWindow *parent, wxFindReplaceData *findData, const wxString &title, int style = 0) + bool Create(wxWindow *parent, wxFindReplaceData *findData, const wxString &title, int style = 0) const wxFindReplaceData *GetData() void SetData(wxFindReplaceData *findData) *************** *** 435,439 **** // --------------------------------------------------------------------------- ! // wxFindReplaceData %enum wxFindReplaceFlags --- 434,439 ---- // --------------------------------------------------------------------------- ! // wxFindReplaceData - Note this must exist while used in a wxFindReplaceDialog ! // and you should delete() it only when the dialog is closed. %enum wxFindReplaceFlags *************** *** 443,447 **** %endenum ! %class %delete %noclassinfo wxFindReplaceData wxFindReplaceData(int flags = 0) --- 443,447 ---- %endenum ! %class %delete %noclassinfo wxFindReplaceData, wxObject wxFindReplaceData(int flags = 0) *************** *** 475,484 **** %endclass ! %endif //wxUSE_FINDREPLDLG & wxLUA_USE_wxFindReplaceDialog // --------------------------------------------------------------------------- // wxProgressDialog ! %if wxUSE_PROGRESSDLG & wxLUA_USE_wxProgressDialog %include "wx/generic/progdlgg.h" --- 475,484 ---- %endclass ! %endif //wxUSE_FINDREPLDLG && wxLUA_USE_wxFindReplaceDialog // --------------------------------------------------------------------------- // wxProgressDialog ! %if wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog %include "wx/generic/progdlgg.h" *************** *** 504,508 **** %endclass ! %endif //wxUSE_PROGRESSDLG & wxLUA_USE_wxProgressDialog // --------------------------------------------------------------------------- --- 504,508 ---- %endclass ! %endif //wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog // --------------------------------------------------------------------------- *************** *** 550,554 **** // wxWizard ! %if wxUSE_WIZARDDLG & wxLUA_USE_wxWizard %include "wx/wizard.h" --- 550,554 ---- // wxWizard ! %if wxUSE_WIZARDDLG && wxLUA_USE_wxWizard %include "wx/wizard.h" *************** *** 559,564 **** wxWizard() wxWizard(wxWindow* parent, int id = -1, const wxString& title = "", const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_DIALOG_STYLE) - bool Create(wxWindow* parent, int id = -1, const wxString& title = "", const wxBitmap& bitmap = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, long style = wxDEFAULT_DIALOG_STYLE) wxWizardPage* GetCurrentPage() const virtual wxSizer* GetPageAreaSizer() const --- 559,564 ---- wxWizard() wxWizard(wxWindow* parent, in... [truncated message content] |