Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i,1.1,1.2 clipdrag.i,1.1,1.2 config.i,1.1,1.2 controls.i,1.1,1.2 data.i,1.1,1.2 datetime.i,1.1,1.2 defsutil.i,1.1,1.2 dialogs.i,1.1,1.2 event.i,1.1,1.2 file.i,1.1,1.2 fl.i,1.1,1.2 gdi.i,1.2,1.3 geometry.i,1.1,1.2 grid.i,1.1,1.2 help.i,1.1,1.2 html.i,1.1,1.2 image.i,1.1,1.2 mdi.i,1.1,1.2 menutool.i,1.1,1.2 override.hpp,1.1,1.2 print.i,1.1,1.2 regex.i,1.1,1.2 sizer.i,1.1,1.2 socket.i,1.1,1.2 stc.i,1.1,1.2 wave.i,1.1,1.2 windows.i,1.1,1.2 wxlua.i,1.2,1.3 xml.i,1.1,1.2
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/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 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 stc.i wave.i windows.i wxlua.i xml.i Log Message: Updated to wxIDE's wrapper files Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wave.i 6 Jun 2005 23:06:07 -0000 1.1 --- wave.i 18 Jun 2005 20:45:59 -0000 1.2 *************** *** 4,23 **** %if wxLUA_USE_wxWave ! %win %define wxSOUND_SYNC ! %win %define wxSOUND_ASYNC ! %win %define wxSOUND_LOOP - %gtk %skip - %mac %skip %class %delete %noclassinfo wxWave, wxObject - %include "wx/wave.h" wxWave(const wxString& fileName, bool isResource = FALSE) %constructor wxWaveDefault() bool Create(const wxString& fileName, bool isResource = FALSE) bool IsOk() const ! bool Play(unsigned int flags = wxSOUND_ASYNC) const %endclass ! %endif wxLUA_USE_wxWave --- 4,26 ---- %if wxLUA_USE_wxWave ! %win %define wxSOUND_SYNC ! %win %define wxSOUND_ASYNC ! %win %define wxSOUND_LOOP ! ! %if %msw&!wxchkver25 ! %include "wx/wave.h" %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 ! !%wxchkver25 bool Play(bool async = TRUE, bool looped = FALSE) const ! %wxchkver25 bool Play(unsigned int flags = wxSOUND_ASYNC) const %endclass + %endif ! // FIXME add wxSound for >2.5 + %endif wxLUA_USE_wxWave Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** windows.i 6 Jun 2005 23:06:07 -0000 1.1 --- windows.i 18 Jun 2005 20:45:59 -0000 1.2 *************** *** 39,44 **** void CentreOnParent(int direction = wxBOTH) void CentreOnScreen(int direction = wxBOTH) ! <wxver25 void Clear() ! ~<wxver25 void ClearBackground() virtual void ClientToScreen(int* x, int* y) const virtual bool Close(bool force = FALSE) --- 39,44 ---- void CentreOnParent(int direction = wxBOTH) void CentreOnScreen(int direction = wxBOTH) ! %wxchkver22&!%wxchkver25 void Clear() ! %wxchkver25 void ClearBackground() virtual void ClientToScreen(int* x, int* y) const virtual bool Close(bool force = FALSE) *************** *** 68,72 **** wxEvtHandler* GetEventHandler() const long GetExtraStyle() const ! wxFont GetFont() const virtual wxColour GetForegroundColour() wxWindow* GetGrandParent() const --- 68,72 ---- wxEvtHandler* GetEventHandler() const long GetExtraStyle() const ! wxFont& GetFont() const virtual wxColour GetForegroundColour() wxWindow* GetGrandParent() const *************** *** 90,94 **** wxValidator* GetValidator() const long GetWindowStyleFlag() const ! ~<wxver23 bool HasCapture() const void InitDialog() virtual bool IsEnabled() const --- 90,94 ---- wxValidator* GetValidator() const long GetWindowStyleFlag() const ! %wxchkver24 bool HasCapture() const void InitDialog() virtual bool IsEnabled() const *************** *** 117,121 **** %rename ScreenToClientXY virtual void ScreenToClient(int* x, int* y) const virtual void ScrollWindow(int dx, int dy, const wxRect* rect = NULL) ! virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) void SetAutoLayout(bool autoLayout) virtual void SetBackgroundColour(const wxColour& colour) --- 117,121 ---- %rename ScreenToClientXY virtual void ScreenToClient(int* x, int* y) const virtual void ScrollWindow(int dx, int dy, const wxRect* rect = NULL) ! wxLUA_USE_wxAcceleratorTable virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) void SetAutoLayout(bool autoLayout) virtual void SetBackgroundColour(const wxColour& colour) *************** *** 156,160 **** %property=Validator, read, write void SetToolTip(const wxString& tip) ! wxToolTip* GetToolTip() const %property=ToolTip, read, write void SetWindowStyle(long style) --- 156,160 ---- %property=Validator, read, write void SetToolTip(const wxString& tip) ! wxLUA_USE_wxTooltip wxToolTip* GetToolTip() const %property=ToolTip, read, write void SetWindowStyle(long style) *************** *** 216,224 **** %define wxNB_FIXEDWIDTH ! ~%wxver22 %define wxNB_TOP %define wxNB_LEFT %define wxNB_RIGHT %define wxNB_BOTTOM ! ~%wxver22 %define wxNB_MULTILINE %typedef wxNotebookPage wxWindow --- 216,224 ---- %define wxNB_FIXEDWIDTH ! %wxchkver23 %define wxNB_TOP %define wxNB_LEFT %define wxNB_RIGHT %define wxNB_BOTTOM ! %wxchkver23 %define wxNB_MULTILINE %typedef wxNotebookPage wxWindow *************** *** 277,288 **** %include "wx/tabctrl.h" ! %gtk %skip %class wxTabCtrl, wxControl %define wxTC_RIGHTJUSTIFY %define wxTC_FIXEDWIDTH ! ~%wxver22 %define wxTC_TOP ! ~%wxver22 %define wxTC_LEFT ! ~%wxver22 %define wxTC_RIGHT ! ~%wxver22 %define wxTC_BOTTOM %define wxTC_MULTILINE %define wxTC_OWNERDRAW --- 277,288 ---- %include "wx/tabctrl.h" ! %if %msw %class wxTabCtrl, wxControl %define wxTC_RIGHTJUSTIFY %define wxTC_FIXEDWIDTH ! %wxchkver23 %define wxTC_TOP ! %wxchkver23 %define wxTC_LEFT ! %wxchkver23 %define wxTC_RIGHT ! %wxchkver23 %define wxTC_BOTTOM %define wxTC_MULTILINE %define wxTC_OWNERDRAW *************** *** 321,325 **** // wxTabEvent - %gtk %skip %class %delete wxTabEvent, wxCommandEvent %win %define %event wxEVT_COMMAND_TAB_SEL_CHANGED --- 321,324 ---- *************** *** 329,332 **** --- 328,333 ---- %endclass + %endif + %endif wxLUA_USE_wxTabCtrl *************** *** 349,358 **** wxSASH_LEFT wxSASH_NONE ! %end %enum wxSashDragStatus wxSASH_STATUS_OK wxSASH_STATUS_OUT_OF_RANGE ! %end %class wxSashWindow, wxWindow --- 350,359 ---- wxSASH_LEFT wxSASH_NONE ! %endenum %enum wxSashDragStatus wxSASH_STATUS_OK wxSASH_STATUS_OUT_OF_RANGE ! %endenum %class wxSashWindow, wxWindow *************** *** 388,397 **** wxLAYOUT_RIGHT wxLAYOUT_BOTTOM ! %end %enum wxLayoutOrientation wxLAYOUT_HORIZONTAL wxLAYOUT_VERTICAL ! %end %class wxSashLayoutWindow, wxSashWindow --- 389,398 ---- wxLAYOUT_RIGHT wxLAYOUT_BOTTOM ! %endenum %enum wxLayoutOrientation wxLAYOUT_HORIZONTAL wxLAYOUT_VERTICAL ! %endenum %class wxSashLayoutWindow, wxSashWindow *************** *** 520,524 **** %define wxSP_FULLSASH %define wxSP_3D ! ~%wxver22 %define wxSP_SASH_AQUA %class wxSplitterWindow, wxWindow --- 521,525 ---- %define wxSP_FULLSASH %define wxSP_3D ! %wxchkver23 %define wxSP_SASH_AQUA %class wxSplitterWindow, wxWindow *************** *** 642,644 **** %endif wxLUA_USE_wxStaticLine - --- 643,644 ---- Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** controls.i 6 Jun 2005 23:06:07 -0000 1.1 --- controls.i 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 19,23 **** %define wxBU_TOP %define wxBU_BOTTOM ! ~%wxver22 %define wxBU_EXACTFIT %class wxButton, wxControl --- 19,23 ---- %define wxBU_TOP %define wxBU_BOTTOM ! %wxchkver23 %define wxBU_EXACTFIT %class wxButton, wxControl *************** *** 72,77 **** void SetValue(const bool state) %property=Value, read, write ! %wxver22 %rename IsChecked bool GetValue() const ! ~%wxver22 bool IsChecked() const %endclass --- 72,77 ---- void SetValue(const bool state) %property=Value, read, write ! %wxchkver22&!%wxchkver23 %rename IsChecked bool GetValue() const ! %wxchkver23 bool IsChecked() const %endclass *************** *** 256,260 **** %define wxLC_AUTOARRANGE %define wxLC_EDIT_LABELS ! ~%wxver22 %define wxLC_HRULES %define wxLC_ICON %define wxLC_LIST --- 256,260 ---- %define wxLC_AUTOARRANGE %define wxLC_EDIT_LABELS ! %wxchkver23 %define wxLC_HRULES %define wxLC_ICON %define wxLC_LIST *************** *** 270,274 **** %define wxLC_SORT_DESCENDING %define wxLC_USER_TEXT ! ~%wxver22 %define wxLC_VRULES %define wxLIST_ALIGN_DEFAULT --- 270,274 ---- %define wxLC_SORT_DESCENDING %define wxLC_USER_TEXT ! %wxchkver23 %define wxLC_VRULES %define wxLIST_ALIGN_DEFAULT *************** *** 316,322 **** wxListCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "listCtrl") bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! SetImageList ! %wxver22 %rename AssignImageList void SetImageList(wxImageList *imageList, int which) ! ~%wxver22 void AssignImageList(wxImageList *imageList, int which) void ClearAll() bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "listCtrl") --- 316,322 ---- wxListCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "listCtrl") bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! // SetImageList ! %wxchkver22&!%wxchkver23 %rename AssignImageList void SetImageList(wxImageList *imageList, int which) ! %wxchkver23 void AssignImageList(wxImageList *imageList, int which) void ClearAll() bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "listCtrl") *************** *** 402,406 **** wxLIST_FORMAT_CENTRE wxLIST_FORMAT_CENTER ! %end %class %delete wxListItem, wxObject --- 402,406 ---- wxLIST_FORMAT_CENTRE wxLIST_FORMAT_CENTER ! %endenum %class %delete wxListItem, wxObject *************** *** 460,464 **** %define %event wxEVT_COMMAND_LIST_DELETE_ITEM %define %event wxEVT_COMMAND_LIST_END_LABEL_EDIT ! %define %event wxEVT_COMMAND_LIST_GET_INFO %define %event wxEVT_COMMAND_LIST_INSERT_ITEM %define %event wxEVT_COMMAND_LIST_ITEM_ACTIVATED --- 460,464 ---- %define %event wxEVT_COMMAND_LIST_DELETE_ITEM %define %event wxEVT_COMMAND_LIST_END_LABEL_EDIT ! %wxchkver22&!%wxchkver25 %define %event wxEVT_COMMAND_LIST_GET_INFO %define %event wxEVT_COMMAND_LIST_INSERT_ITEM %define %event wxEVT_COMMAND_LIST_ITEM_ACTIVATED *************** *** 468,482 **** %define %event wxEVT_COMMAND_LIST_ITEM_SELECTED %define %event wxEVT_COMMAND_LIST_KEY_DOWN ! %define %event wxEVT_COMMAND_LIST_SET_INFO ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_CACHE_HINT ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_COL_RIGHT_CLICK ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_COL_BEGIN_DRAG ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_COL_DRAGGING ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_COL_END_DRAG ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_ITEM_FOCUSED wxListEvent(wxEventType commandType = 0, int id = 0) ! %wxver22 %rename GetKeyCode int GetCode() const ! ~%wxver22 int GetKeyCode() const %property=KeyCode, read long GetIndex() const --- 468,482 ---- %define %event wxEVT_COMMAND_LIST_ITEM_SELECTED %define %event wxEVT_COMMAND_LIST_KEY_DOWN ! %wxchkver22&!%wxchkver25 %define %event wxEVT_COMMAND_LIST_SET_INFO ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_CACHE_HINT ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_COL_RIGHT_CLICK ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_COL_BEGIN_DRAG ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_COL_DRAGGING ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_COL_END_DRAG ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_ITEM_FOCUSED wxListEvent(wxEventType commandType = 0, int id = 0) ! %wxchkver22&!%wxchkver23 %rename GetKeyCode int GetCode() const ! %wxchkver23 int GetKeyCode() const %property=KeyCode, read long GetIndex() const *************** *** 523,530 **** int GetSelection() const wxString GetStringSelection() const ! ~%wxver22 int GetCount() const ! %wxver22 %rename GetCount int Number() const %property=Count, read ! ~%wxver22 %rename SetItemString void SetString(int n, const wxString &label) void SetSelection(int n) %property=Selection, read, write --- 523,530 ---- int GetSelection() const wxString GetStringSelection() const ! %wxchkver23 int GetCount() const ! %wxchkver22&!%wxchkver23 %rename GetCount int Number() const %property=Count, read ! %wxchkver23 %rename SetItemString void SetString(int n, const wxString &label) void SetSelection(int n) %property=Selection, read, write *************** *** 546,550 **** %define wxRB_GROUP ! ~%wxver22 %define wxRB_SINGLE %class wxRadioButton, wxControl --- 546,550 ---- %define wxRB_GROUP ! %wxchkver23 %define wxRB_SINGLE %class wxRadioButton, wxControl *************** *** 719,734 **** %define wxTE_READONLY %define wxTE_RICH ! ~%wxver22 %define wxTE_RICH2 ! ~%wxver22 %define wxTE_AUTO_URL ! ~%wxver22 %define wxTE_NOHIDESEL %define wxHSCROLL ! ~%wxver22 %define wxTE_LEFT ! ~%wxver22 %define wxTE_CENTRE ! ~%wxver22 %define wxTE_RIGHT ! ~%wxver22 %define wxTE_DONTWRAP ! ~%wxver22 %define wxTE_LINEWRAP ! ~%wxver22 %define wxTE_WORDWRAP ! ~%wxver22 %define wxTE_AUTO_SCROLL ! ~%wxver22 %define wxTE_NO_VSCROLL %class wxTextCtrl, wxControl --- 719,734 ---- %define wxTE_READONLY %define wxTE_RICH ! %wxchkver23 %define wxTE_RICH2 ! %wxchkver23 %define wxTE_AUTO_URL ! %wxchkver23 %define wxTE_NOHIDESEL %define wxHSCROLL ! %wxchkver23 %define wxTE_LEFT ! %wxchkver23 %define wxTE_CENTRE ! %wxchkver23 %define wxTE_RIGHT ! %wxchkver23 %define wxTE_DONTWRAP ! %wxchkver23 %define wxTE_LINEWRAP ! %wxchkver23 %define wxTE_WORDWRAP ! %wxchkver23 %define wxTE_AUTO_SCROLL ! %wxchkver23 %define wxTE_NO_VSCROLL %class wxTextCtrl, wxControl *************** *** 783,791 **** %include "wx/treectrl.h" ! ~%wxver22 %define wxTR_NO_BUTTONS %define wxTR_HAS_BUTTONS ! ~%wxver22 %define wxTR_TWIST_BUTTONS %define wxTR_NO_LINES ! ~%wxver22 %define wxTR_MAC_BUTTONS %define wxTR_SINGLE %define wxTR_MULTIPLE --- 783,791 ---- %include "wx/treectrl.h" ! %wxchkver23 %define wxTR_NO_BUTTONS %define wxTR_HAS_BUTTONS ! %wxchkver23 %define wxTR_TWIST_BUTTONS %define wxTR_NO_LINES ! %wxchkver23 %define wxTR_MAC_BUTTONS %define wxTR_SINGLE %define wxTR_MULTIPLE *************** *** 793,800 **** %define wxTR_EDIT_LABELS %define wxTR_LINES_AT_ROOT ! ~%wxver22 %define wxTR_HIDE_ROOT ! ~%wxver22 %define wxTR_ROW_LINES %define wxTR_HAS_VARIABLE_ROW_HEIGHT ! ~%wxver22 %define wxTR_DEFAULT_STYLE %enum wxTreeItemIcon --- 793,800 ---- %define wxTR_EDIT_LABELS %define wxTR_LINES_AT_ROOT ! %wxchkver23 %define wxTR_HIDE_ROOT ! %wxchkver23 %define wxTR_ROW_LINES %define wxTR_HAS_VARIABLE_ROW_HEIGHT ! %wxchkver23 %define wxTR_DEFAULT_STYLE %enum wxTreeItemIcon *************** *** 804,808 **** wxTreeItemIcon_SelectedExpanded wxTreeItemIcon_Max ! %end %define wxTREE_HITTEST_ABOVE --- 804,808 ---- wxTreeItemIcon_SelectedExpanded wxTreeItemIcon_Max ! %endenum %define wxTREE_HITTEST_ABOVE *************** *** 840,845 **** %property=Count, read // wxTextCtrl& GetEditControl() const ! <wxver25|%compat24 wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const ! ~<wxver25 wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetFirstVisibleItem() const %property=FirstVisibleItem, read --- 840,846 ---- %property=Count, read // wxTextCtrl& GetEditControl() const ! //%wxchkver22&!%wxchkver25|%wxcompat24 wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const ! //%wxchkver25 wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const ! wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const //override handles this wxTreeItemId GetFirstVisibleItem() const %property=FirstVisibleItem, read *************** *** 850,864 **** wxString GetItemText(const wxTreeItemId& item) const wxTreeItemId GetLastChild(const wxTreeItemId& item) const ! <wxver25|%compat24 wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const ! ~<wxver25 wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetNextSibling(const wxTreeItemId& item) const wxTreeItemId GetNextVisible(const wxTreeItemId& item) const ! <wxver24 %rename GetItemParent wxTreeItemId GetParent(const wxTreeItemId& item) const ! ~<wxver24 wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxTreeItemId GetRootItem() const %property=RootItem, read ! <wxver25|%wxcompat24 int GetItemSelectedImage(const wxTreeItemId& item) const wxTreeItemId GetSelection() const %property=Selection, read --- 851,866 ---- wxString GetItemText(const wxTreeItemId& item) const wxTreeItemId GetLastChild(const wxTreeItemId& item) const ! //%wxchkver22&!%wxchkver25|%wxcompat24 wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const ! //%wxchkver25 wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const ! wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const // override handles this wxTreeItemId GetNextSibling(const wxTreeItemId& item) const wxTreeItemId GetNextVisible(const wxTreeItemId& item) const ! %wxchkver22&!%wxchkver24 %rename GetItemParent wxTreeItemId GetParent(const wxTreeItemId& item) const ! %wxchkver24 wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxTreeItemId GetRootItem() const %property=RootItem, read ! %wxchkver22&!%wxchkver25|%wxcompat24 int GetItemSelectedImage(const wxTreeItemId& item) const wxTreeItemId GetSelection() const %property=Selection, read *************** *** 885,889 **** void SetItemHasChildren(const wxTreeItemId& item, bool hasChildren = TRUE) void SetItemImage(const wxTreeItemId& item, int image, wxTreeItemIcon which = wxTreeItemIcon_Normal) ! <wxver25|%wxcompat24 void SetItemSelectedImage(const wxTreeItemId& item, int selImage) void SetItemText(const wxTreeItemId& item, const wxString& text) void SetItemTextColour(const wxTreeItemId& item, const wxColour& col) --- 887,891 ---- void SetItemHasChildren(const wxTreeItemId& item, bool hasChildren = TRUE) void SetItemImage(const wxTreeItemId& item, int image, wxTreeItemIcon which = wxTreeItemIcon_Normal) ! %wxchkver22&!%wxchkver25|%wxcompat24 void SetItemSelectedImage(const wxTreeItemId& item, int selImage) void SetItemText(const wxTreeItemId& item, const wxString& text) void SetItemTextColour(const wxTreeItemId& item, const wxColour& col) *************** *** 918,924 **** // wxTreeItemIdValue - wxTreeCtrl ! <wxver25 %skip %class %noclassinfo wxTreeItemIdValue %endclass /////////////////////////////////////////////////////////////////////////////// --- 920,927 ---- // wxTreeItemIdValue - wxTreeCtrl ! %if %wxchkver25 %class %noclassinfo wxTreeItemIdValue %endclass + %endif /////////////////////////////////////////////////////////////////////////////// *************** *** 928,934 **** wxTreeItemId() bool IsOk() ! double GetValue() const; ! void SetValue(double value); ! %property=Value, read, write); %endclass --- 931,937 ---- wxTreeItemId() bool IsOk() ! double GetValue() const ! void SetValue(double value) ! %property=Value, read, write %endclass *************** *** 987,992 **** wxPoint GetPoint() const %property=Point, read ! %wxver22 %rename GetKeyCode int GetCode() const ! ~%wxver22 int GetKeyCode() const %property=KeyCode, read const wxString& GetLabel() const --- 990,995 ---- wxPoint GetPoint() const %property=Point, read ! %wxchkver22&!%wxchkver23 %rename GetKeyCode int GetCode() const ! %wxchkver23 int GetKeyCode() const %property=KeyCode, read const wxString& GetLabel() const Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gdi.i 7 Jun 2005 05:56:57 -0000 1.2 --- gdi.i 18 Jun 2005 20:45:59 -0000 1.3 *************** *** 105,109 **** wxPartRegion wxInRegion ! %end %class wxRegion, wxGDIObject --- 105,109 ---- wxPartRegion wxInRegion ! %endenum %class wxRegion, wxGDIObject *************** *** 185,189 **** wxITALIC wxSLANT ! %end %enum wxFontFamily --- 185,189 ---- wxITALIC wxSLANT ! %endenum %enum wxFontFamily *************** *** 196,201 **** wxFONTFAMILY_TELETYPE wxFONTFAMILY_MAX ! ~%wxver22 wxFONTFAMILY_UNKNOWN ! %end %enum wxFontStyle --- 196,201 ---- wxFONTFAMILY_TELETYPE wxFONTFAMILY_MAX ! %wxchkver23 wxFONTFAMILY_UNKNOWN ! %endenum %enum wxFontStyle *************** *** 204,208 **** wxFONTSTYLE_SLANT wxFONTSTYLE_MAX ! %end %enum wxFontWeight --- 204,208 ---- wxFONTSTYLE_SLANT wxFONTSTYLE_MAX ! %endenum %enum wxFontWeight *************** *** 211,215 **** wxFONTWEIGHT_BOLD wxFONTWEIGHT_MAX ! %end %enum wxFontEncoding --- 211,215 ---- wxFONTWEIGHT_BOLD wxFONTWEIGHT_MAX ! %endenum %enum wxFontEncoding *************** *** 241,248 **** wxFONTENCODING_CP866 wxFONTENCODING_CP874 ! ~%wxver22 wxFONTENCODING_CP932 ! ~%wxver22 wxFONTENCODING_CP936 ! ~%wxver22 wxFONTENCODING_CP949 ! ~%wxver22 wxFONTENCODING_CP950 wxFONTENCODING_CP1250 wxFONTENCODING_CP1251 --- 241,248 ---- wxFONTENCODING_CP866 wxFONTENCODING_CP874 ! %wxchkver23 wxFONTENCODING_CP932 ! %wxchkver23 wxFONTENCODING_CP936 ! %wxchkver23 wxFONTENCODING_CP949 ! %wxchkver23 wxFONTENCODING_CP950 wxFONTENCODING_CP1250 wxFONTENCODING_CP1251 *************** *** 254,262 **** wxFONTENCODING_CP1257 wxFONTENCODING_CP12_MAX ! ~%wxver22 wxFONTENCODING_UTF7 ! ~%wxver22 wxFONTENCODING_UTF8 wxFONTENCODING_UNICODE wxFONTENCODING_MAX ! %end %class %delete wxFont, wxGDIObject --- 254,262 ---- wxFONTENCODING_CP1257 wxFONTENCODING_CP12_MAX ! %wxchkver23 wxFONTENCODING_UTF7 ! %wxchkver23 wxFONTENCODING_UTF8 wxFONTENCODING_UNICODE wxFONTENCODING_MAX ! %endenum %class %delete wxFont, wxGDIObject *************** *** 411,415 **** wxHORIZONTAL_HATCH wxVERTICAL_HATCH ! %end %class %delete wxPen, wxGDIObject --- 411,415 ---- wxHORIZONTAL_HATCH wxVERTICAL_HATCH ! %endenum %class %delete wxPen, wxGDIObject *************** *** 468,472 **** void RemovePen(wxPen *pen) wxPen *FindOrCreatePen(const wxColour& colour, int width, int style) ! %enclass %endif wxLUA_USE_wxPenList --- 468,472 ---- void RemovePen(wxPen *pen) wxPen *FindOrCreatePen(const wxColour& colour, int width, int style) ! %endclass %endif wxLUA_USE_wxPenList *************** *** 543,594 **** /////////////////////////////////////////////////////////////////////////////// - - %if wxLUA_USE_wxBitmap - %if wxLUA_USE_wxIcon - %if wxLUA_USE_wxImage - - %enum wxBitmapType - wxBITMAP_TYPE_INVALID - wxBITMAP_TYPE_BMP - wxBITMAP_TYPE_BMP_RESOURCE - wxBITMAP_TYPE_RESOURCE - wxBITMAP_TYPE_BMP_RESOURCE - wxBITMAP_TYPE_ICO - wxBITMAP_TYPE_ICO_RESOURCE - wxBITMAP_TYPE_CUR - wxBITMAP_TYPE_CUR_RESOURCE - wxBITMAP_TYPE_XBM - wxBITMAP_TYPE_XBM_DATA - wxBITMAP_TYPE_XPM - wxBITMAP_TYPE_XPM_DATA - wxBITMAP_TYPE_TIF - wxBITMAP_TYPE_TIF_RESOURCE - wxBITMAP_TYPE_GIF - wxBITMAP_TYPE_GIF_RESOURCE - wxBITMAP_TYPE_PNG - wxBITMAP_TYPE_PNG_RESOURCE - wxBITMAP_TYPE_JPEG - wxBITMAP_TYPE_JPEG_RESOURCE - wxBITMAP_TYPE_PNM - wxBITMAP_TYPE_PNM_RESOURCE - wxBITMAP_TYPE_PCX - wxBITMAP_TYPE_PCX_RESOURCE - wxBITMAP_TYPE_PICT - wxBITMAP_TYPE_PICT_RESOURCE - wxBITMAP_TYPE_ICON - wxBITMAP_TYPE_ICON_RESOURCE - wxBITMAP_TYPE_MACCURSOR - wxBITMAP_TYPE_MACCURSOR_RESOURCE - wxBITMAP_TYPE_ANY - %end - - %endif wxLUA_USE_wxBitmap - %endif wxLUA_USE_wxIcon - %endif wxLUA_USE_wxImage - - /////////////////////////////////////////////////////////////////////////////// // wxIcon %if wxLUA_USE_wxIcon %class %delete wxIcon, wxGDIObject --- 543,550 ---- /////////////////////////////////////////////////////////////////////////////// // wxIcon %if wxLUA_USE_wxIcon + %typedef WXHANDLE void* %class %delete wxIcon, wxGDIObject *************** *** 598,610 **** //%constructor wxNewIcon(int width, int height, int depth = -1) // constructor does not exist %constructor wxDefaultIcon() ! %win void CopyFromBitmap(const wxBitmap& bmp) ! %mac void CopyFromBitmap(const wxBitmap& bmp) ! ~<wxver25 %gtk void CopyFromBitmap(const wxBitmap& bmp) int GetDepth() int GetWidth() int GetHeight() bool LoadFile(const wxString& name, wxBitmapType flags) ! // %win long GetHandle() // FIXME doesn't work in wx25 and for wxIcon what could you do with it ! // %win void SetHandle(long handle) bool Ok() void SetWidth(int w) --- 554,564 ---- //%constructor wxNewIcon(int width, int height, int depth = -1) // constructor does not exist %constructor wxDefaultIcon() ! %win|%mac|%wxchkver25 void CopyFromBitmap(const wxBitmap& bmp) int GetDepth() int GetWidth() int GetHeight() bool LoadFile(const wxString& name, wxBitmapType flags) ! %win WXHANDLE GetHandle() ! %win void SetHandle(WXHANDLE handle) bool Ok() void SetWidth(int w) *************** *** 631,635 **** %endclass ! ~<wxver25 %win %class %noclassinfo wxGDIImageHandlerList, wxList %endclass --- 585,589 ---- %endclass ! %wxchkver25&%win %class %noclassinfo wxGDIImageHandlerList, wxList %endclass *************** *** 643,653 **** %constructor wxBitmapFromFile( const wxString& name, long type) %constructor wxBitmapFromXPMData(const char **data) ! ~%wxver22 %constructor wxBitmapFromImage(const wxImage &image, int depth = -1) %win static void AddHandler(wxBitmapHandler* handler) %win static void CleanUpHandlers() virtual bool Create(int width, int height, int depth = -1) int GetDepth() const ! ~<wxver25 %win static wxGDIImageHandlerList& GetHandlers() ! <wxver25 %win static wxList& GetHandlers() int GetHeight() const wxPalette* GetPalette() const --- 597,607 ---- %constructor wxBitmapFromFile( const wxString& name, long type) %constructor wxBitmapFromXPMData(const char **data) ! %wxchkver23 %constructor wxBitmapFromImage(const wxImage &image, int depth = -1) %win static void AddHandler(wxBitmapHandler* handler) %win static void CleanUpHandlers() virtual bool Create(int width, int height, int depth = -1) int GetDepth() const ! %wxchkver25&%win static wxGDIImageHandlerList& GetHandlers() ! %wxchkver22&!%wxchkver25&%win static wxList& GetHandlers() int GetHeight() const wxPalette* GetPalette() const *************** *** 681,684 **** --- 635,640 ---- %if wxLUA_USE_wxCursor + %typedef WXHANDLE void* + %include "wx/cursor.h" *************** *** 686,690 **** wxCURSOR_NONE wxCURSOR_ARROW ! ~%wxver22 wxCURSOR_RIGHT_ARROW wxCURSOR_BULLSEYE wxCURSOR_CHAR --- 642,646 ---- wxCURSOR_NONE wxCURSOR_ARROW ! %wxchkver23 wxCURSOR_RIGHT_ARROW wxCURSOR_BULLSEYE wxCURSOR_CHAR *************** *** 712,716 **** wxCURSOR_BLANK wxCURSOR_DEFAULT ! %end %class %delete wxCursor, wxBitmap --- 668,672 ---- wxCURSOR_BLANK wxCURSOR_DEFAULT ! %endenum %class %delete wxCursor, wxBitmap *************** *** 724,730 **** %constructor wxStockCursor(int id) bool Ok() ! // %win long GetHandle() FIXME - wxCursor what could you do with this? ! // %win void SetHandle(long handle) ! // %win %property=Handle, read, write %win int GetWidth() %win int GetHeight() --- 680,686 ---- %constructor wxStockCursor(int id) bool Ok() ! %win WXHANDLE GetHandle() ! %win void SetHandle(WXHANDLE handle) ! %win %property=Handle, read, write %win int GetWidth() %win int GetHeight() *************** *** 784,789 **** bool Remove(int index) %win bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap) ! %gtk bool Replace(int index, const wxBitmap& bitmap) ! %mac bool Replace(int index, const wxBitmap& bitmap) //bool ReplaceIcon(int index, const wxIcon& icon) bool RemoveAll() --- 740,744 ---- bool Remove(int index) %win bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap) ! %gtk|%mac bool Replace(int index, const wxBitmap& bitmap) //bool ReplaceIcon(int index, const wxIcon& icon) bool RemoveAll() *************** *** 902,918 **** void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE) // alias ! // wxBrush& GetBackground() removed in 2.5 ! const wxBrush& GetBackground() const int GetBackgroundMode() const ! // wxBrush& GetBrush() removed in 2.5 ! const wxBrush& GetBrush() const wxCoord GetCharHeight() wxCoord GetCharWidth() void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) ! const wxFont& GetFont() const int GetLogicalFunction() int GetMapMode() ! bool GetOptimization() ! const wxPen& GetPen() const // const wxPen& GetPen() const bool GetPixel(wxCoord x, wxCoord y, wxColour *colour) --- 857,873 ---- void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE) // alias ! const wxBrush& GetBackground() ! // const wxBrush& GetBackground() const int GetBackgroundMode() const ! const wxBrush& GetBrush() ! // const wxBrush& GetBrush() const wxCoord GetCharHeight() wxCoord GetCharWidth() void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) ! const wxFont& GetFont() int GetLogicalFunction() int GetMapMode() ! %wxchkver24&!%wxchkver25|%wxcompat24 bool GetOptimization() ! const wxPen& GetPen() // const wxPen& GetPen() const bool GetPixel(wxCoord x, wxCoord y, wxColour *colour) *************** *** 922,926 **** const wxColour& GetTextBackground() const void GetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) ! const wxColour& GetTextForeground() const // const wxColour& GetTextForeground() const void GetUserScale(double *x, double *y) --- 877,881 ---- const wxColour& GetTextBackground() const void GetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) ! const wxColour& GetTextForeground() // const wxColour& GetTextForeground() const void GetUserScale(double *x, double *y) *************** *** 949,954 **** %property=Font, read, write // void SetMapMode(int unit) ! void SetOptimization(bool optimize) ! %property=Optimization, read, write void SetPen(const wxPen& pen) %property=Pen, read, write --- 904,909 ---- %property=Font, read, write // void SetMapMode(int unit) ! %wxchkver24&!%wxchkver25|%wxcompat24 void SetOptimization(bool optimize) ! %wxchkver24&!%wxchkver25|%wxcompat24 %property=Optimization, read, write void SetPen(const wxPen& pen) %property=Pen, read, write Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** html.i 6 Jun 2005 23:06:07 -0000 1.1 --- html.i 18 Jun 2005 20:45:59 -0000 1.2 *************** *** 25,29 **** int GetHeight() const %property=Height, read ! ~%wxver22 virtual wxString GetId() const virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const wxHtmlCell* GetNext() const --- 25,29 ---- int GetHeight() const %property=Height, read ! %wxchkver23 virtual wxString GetId() const virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const wxHtmlCell* GetNext() const *************** *** 37,42 **** virtual void Layout(int w) //virtual void OnMouseClick(wxWindow* parent, intx, int y, const wxMouseEvent& event) ! ~%wxver22 void SetId(const wxString& id) ! ~%wxver22 %property=Id, read, write void SetLink(const wxHtmlLinkInfo& link) void SetNext(wxHtmlCell *cell) --- 37,42 ---- virtual void Layout(int w) //virtual void OnMouseClick(wxWindow* parent, intx, int y, const wxMouseEvent& event) ! %wxchkver23 void SetId(const wxString& id) ! %wxchkver23 %property=Id, read, write void SetLink(const wxHtmlLinkInfo& link) void SetNext(wxHtmlCell *cell) *************** *** 92,97 **** //bool IsEnding() const //wxString ScanParam(const wxString& par, const wxString &format, void *value) const ! ~%wxver22 bool GetParamAsColour(const wxString& par, wxColour *clr) const ! ~%wxver22 bool GetParamAsInt(const wxString& par, int *value) const %endclass --- 92,97 ---- //bool IsEnding() const //wxString ScanParam(const wxString& par, const wxString &format, void *value) const ! %wxchkver23 bool GetParamAsColour(const wxString& par, wxColour *clr) const ! %wxchkver23 bool GetParamAsInt(const wxString& par, int *value) const %endclass *************** *** 122,128 **** int GetAlignHor() const int GetAlignVer() const ! ~<wxver25 wxHtmlCell* GetFirstChild() ! <wxver25|%wxcompat24 wxHtmlCell* GetFirstCell() ! <wxver25|%wxcompat24 %property=FirstCell, read int GetIndent(int ind) const int GetIndentUnits(int ind) const --- 122,128 ---- int GetAlignHor() const int GetAlignVer() const ! %wxchkver25 wxHtmlCell* GetFirstChild() ! %wxchkver22&!%wxchkver25|%wxcompat24 wxHtmlCell* GetFirstCell() ! %wxchkver22&!%wxchkver25|%wxcompat24 %property=FirstCell, read int GetIndent(int ind) const int GetIndentUnits(int ind) const *************** *** 152,156 **** wxHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = "htmlWindow") //static void AddFilter(wxHtmlFilter *filter) ! ~%wxver22 bool AppendToPage(const wxString& source) wxHtmlContainerCell* GetInternalRepresentation() const %property=InternalRepresentation, read --- 152,156 ---- wxHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = "htmlWindow") //static void AddFilter(wxHtmlFilter *filter) ! %wxchkver23 bool AppendToPage(const wxString& source) wxHtmlContainerCell* GetInternalRepresentation() const %property=InternalRepresentation, read *************** *** 163,171 **** wxFrame* GetRelatedFrame() const %property=RelatedFrame, read ! ~%wxver22 bool HistoryBack() ! ~%wxver22 bool HistoryCanBack() ! ~%wxver22 bool HistoryCanForward() ! ~%wxver22 void HistoryClear() ! ~%wxver22 bool HistoryForward() bool LoadPage(const wxString& location) void ReadCustomization(wxConfigBase *cfg, wxString path = wxEmptyString) --- 163,171 ---- wxFrame* GetRelatedFrame() const %property=RelatedFrame, read ! %wxchkver23 bool HistoryBack() ! %wxchkver23 bool HistoryCanBack() ! %wxchkver23 bool HistoryCanForward() ! %wxchkver23 void HistoryClear() ! %wxchkver23 bool HistoryForward() bool LoadPage(const wxString& location) void ReadCustomization(wxConfigBase *cfg, wxString path = wxEmptyString) *************** *** 270,274 **** bool PrintFile(const wxString& htmlfile) bool PrintText(const wxString& htmltext, const wxString& basepath = wxEmptyString) ! <wxver25 void PrinterSetup() void PageSetup() wxPrintData* GetPrintData() --- 270,274 ---- bool PrintFile(const wxString& htmlfile) bool PrintText(const wxString& htmltext, const wxString& basepath = wxEmptyString) ! %wxchkver24&!%wxchkver25 void PrinterSetup() void PageSetup() wxPrintData* GetPrintData() Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** datetime.i 6 Jun 2005 23:06:07 -0000 1.1 --- datetime.i 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 17,23 **** %builtin long wxGetElapsedTime(bool resetTimer = TRUE) %builtin void wxSleep(int secs) ! >wxver24 %builtin void wxMilliSleep(unsigned long milliseconds); ! >wxver24 %builtin void wxMicroSleep(unsigned long microseconds); ! <wxver25 %builtin void wxUsleep(unsigned long milliseconds) /////////////////////////////////////////////////////////////////////////////// --- 17,23 ---- %builtin long wxGetElapsedTime(bool resetTimer = TRUE) %builtin void wxSleep(int secs) ! %wxchkver25 %builtin void wxMilliSleep(unsigned long milliseconds) ! %wxchkver25 %builtin void wxMicroSleep(unsigned long microseconds) ! !%wxchkver25 %builtin void wxUsleep(unsigned long milliseconds) /////////////////////////////////////////////////////////////////////////////// *************** *** 81,90 **** A_ESST UTC ! %end %enum wxDateTime::Calendar Gregorian Julian ! %end %enum wxDateTime::Country --- 81,90 ---- A_ESST UTC ! %endenum %enum wxDateTime::Calendar Gregorian Julian ! %endenum %enum wxDateTime::Country *************** *** 99,103 **** Russia USA ! %end %enum wxDateTime::Month --- 99,103 ---- Russia USA ! %endenum %enum wxDateTime::Month *************** *** 115,119 **** Dec Inv_Month ! %end %enum wxDateTime::WeekDay --- 115,119 ---- Dec Inv_Month ! %endenum %enum wxDateTime::WeekDay *************** *** 126,132 **** Sat Inv_WeekDay ! %end ! %typedef wxDateTime_t unsigned short %class %delete %noclassinfo %encapsulate wxDateTime --- 126,132 ---- Sat Inv_WeekDay ! %endenum ! %typedef wxDateTime::wxDateTime_t unsigned short %class %delete %noclassinfo %encapsulate wxDateTime *************** *** 136,154 **** %constructor wxDateTimeFromTime(time_t dateTime) %constructor wxDateTimeFromJDN(double dateTime) ! %constructor wxDateTimeFromHMS(wxDateTime_t hour, wxDateTime_t minute, wxDateTime_t second, wxDateTime_t millisec) ! %constructor wxDateTimeFromDMY(wxDateTime_t day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, wxDateTime_t hour = 0, wxDateTime_t minute = 0, wxDateTime_t second = 0, wxDateTime_t millisec = 0u) wxDateTime& SetToCurrent() %rename SetToTime wxDateTime& Set(long time) %rename SetToJDN wxDateTime& Set(double dateTime) ! %rename SetToHMS wxDateTime& Set(wxDateTime_t hour, wxDateTime_t minute, wxDateTime_t second, wxDateTime_t millisec) ! %rename SetToDMY wxDateTime& Set(wxDateTime_t day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, wxDateTime_t hour = 0, wxDateTime_t minute = 0, wxDateTime_t second = 0, wxDateTime_t millisec = 0) wxDateTime& ResetTime() ! wxDateTime& SetDay(wxDateTime_t day) wxDateTime& SetMonth(wxDateTime::Month month) wxDateTime& SetYear(int year) ! wxDateTime& SetHour(wxDateTime_t hour) ! wxDateTime& SetMinute(wxDateTime_t minute) ! wxDateTime& SetSecond(wxDateTime_t second) ! wxDateTime& SetMillisecond(wxDateTime_t millisecond) bool IsWorkDay(wxDateTime::Country country = wxDateTime::Country_Default) const bool IsEqualTo(const wxDateTime& datetime) const --- 136,154 ---- %constructor wxDateTimeFromTime(time_t dateTime) %constructor wxDateTimeFromJDN(double dateTime) ! %constructor wxDateTimeFromHMS(int hour, int minute, int second, int millisec) ! %constructor wxDateTimeFromDMY(int day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, int hour = 0, int minute = 0, int second = 0, int millisec = 0) wxDateTime& SetToCurrent() %rename SetToTime wxDateTime& Set(long time) %rename SetToJDN wxDateTime& Set(double dateTime) ! %rename SetToHMS wxDateTime& Set(int hour, int minute, int second, int millisec) ! %rename SetToDMY wxDateTime& Set(int day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, int hour = 0, int minute = 0, int second = 0, int millisec = 0) wxDateTime& ResetTime() ! wxDateTime& SetDay(int day) wxDateTime& SetMonth(wxDateTime::Month month) wxDateTime& SetYear(int year) ! wxDateTime& SetHour(int hour) ! wxDateTime& SetMinute(int minute) ! wxDateTime& SetSecond(int second) ! wxDateTime& SetMillisecond(int millisecond) bool IsWorkDay(wxDateTime::Country country = wxDateTime::Country_Default) const bool IsEqualTo(const wxDateTime& datetime) const *************** *** 172,182 **** bool SetToLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) ! <wxver25 bool SetToTheWeek(wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) ! <wxver25 wxDateTime GetWeek(wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) const ! >wxver24 static wxDateTime SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay weekday = wxDateTime::Mon) wxDateTime& SetToLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) const ! wxDateTime& SetToYearDay(wxDateTime_t yday) ! wxDateTime GetYearDay(wxDateTime_t yday) const double GetJulianDayNumber() const double GetJDN() const --- 172,182 ---- bool SetToLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) ! bool SetToTheWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) ! wxDateTime GetWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) const ! %wxchkver25 static wxDateTime SetToWeekOfYear(int year, wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) wxDateTime& SetToLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) const ! wxDateTime& SetToYearDay(wxDateTime::wxDateTime_t yday) ! wxDateTime GetYearDay(wxDateTime::wxDateTime_t yday) const double GetJulianDayNumber() const double GetJDN() const *************** *** 326,332 **** wxCAL_NO_YEAR_CHANGE wxCAL_NO_MONTH_CHANGE ! ~%wxver22 wxCAL_SHOW_SURROUNDING_WEEKS ! ~%wxver22 wxCAL_SEQUENTIAL_MONTH_SELECTION ! %end %enum wxCalendarHitTestResult --- 326,332 ---- wxCAL_NO_YEAR_CHANGE wxCAL_NO_MONTH_CHANGE ! %wxchkver23 wxCAL_SHOW_SURROUNDING_WEEKS ! %wxchkver23 wxCAL_SEQUENTIAL_MONTH_SELECTION ! %endenum %enum wxCalendarHitTestResult *************** *** 334,341 **** wxCAL_HITTEST_HEADER wxCAL_HITTEST_DAY ! ~%wxver22 wxCAL_HITTEST_INCMONTH ! ~%wxver22 wxCAL_HITTEST_DECMONTH ! ~%wxver22 wxCAL_HITTEST_SURROUNDING_WEEK ! %end %enum wxCalendarDateBorder --- 334,341 ---- wxCAL_HITTEST_HEADER wxCAL_HITTEST_DAY ! %wxchkver23 wxCAL_HITTEST_INCMONTH ! %wxchkver23 wxCAL_HITTEST_DECMONTH ! %wxchkver23 wxCAL_HITTEST_SURROUNDING_WEEK ! %endenum %enum wxCalendarDateBorder *************** *** 343,347 **** wxCAL_BORDER_SQUARE wxCAL_BORDER_ROUND ! %end %class wxCalendarCtrl, wxControl --- 343,347 ---- wxCAL_BORDER_SQUARE wxCAL_BORDER_ROUND ! %endenum %class wxCalendarCtrl, wxControl Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxlua.i 7 Jun 2005 04:17:38 -0000 1.2 --- wxlua.i 18 Jun 2005 20:45:59 -0000 1.3 *************** *** 83,88 **** %if wxLUA_USE_wxLuaPrintout ! %inlinefile printing.h ! %inlinefile printing.cpp %class %delete wxLuaPrintout, wxPrintout --- 83,87 ---- %if wxLUA_USE_wxLuaPrintout ! %include "wxbind/include/wxlprint.h" %class %delete wxLuaPrintout, wxPrintout *************** *** 99,104 **** %if wxLUA_USE_wxLuaHtmlWindow ! %inlinefile htmlwin.h ! %inlinefile htmlwin.cpp %class wxLuaHtmlWindow, wxHtmlWindow --- 98,102 ---- %if wxLUA_USE_wxLuaHtmlWindow ! %include "wxbind/include/wxlhtmlwin.h" %class wxLuaHtmlWindow, wxHtmlWindow Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** clipdrag.i 6 Jun 2005 23:06:07 -0000 1.1 --- clipdrag.i 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 17,21 **** %class wxClipboard, wxObject ! <wxver25 %define %pointer wxTheClipboard void UsePrimarySelection( bool primary = FALSE ) --- 17,21 ---- %class wxClipboard, wxObject ! !%wxchkver25 %define %pointer wxTheClipboard void UsePrimarySelection( bool primary = FALSE ) *************** *** 29,33 **** void Close() bool Open() ! <wxver24 %skip static wxClipboard *Get() %endclass --- 29,33 ---- void Close() bool Open() ! %wxchkver25 static wxClipboard *Get() %endclass *************** *** 60,66 **** wxDF_LOCALE wxDF_PRIVATE ! ~%wxver22 wxDF_HTML ! ~%wxver22 wxDF_MAX ! %end %class %delete %noclassinfo %encapsulate wxDataFormat --- 60,66 ---- wxDF_LOCALE wxDF_PRIVATE ! %wxchkver23 wxDF_HTML ! %wxchkver23 wxDF_MAX ! %endenum %class %delete %noclassinfo %encapsulate wxDataFormat *************** *** 83,87 **** Get Set ! %end %class %noclassinfo wxDataObject --- 83,87 ---- Get Set ! %endenum %class %noclassinfo wxDataObject *************** *** 164,172 **** %include "wx/dnd.h" ! ~%wxver22 %enum ! ~%wxver22 wxDrag_CopyOnly ! ~%wxver22 wxDrag_AllowMove ! ~%wxver22 wxDrag_DefaultMove ! ~%wxver22 %end %enum wxDragResult --- 164,174 ---- %include "wx/dnd.h" ! %if %wxchkver23 ! %enum ! wxDrag_CopyOnly ! wxDrag_AllowMove ! wxDrag_DefaultMove ! %endenum ! %endif %enum wxDragResult *************** *** 176,180 **** wxDragMove wxDragCancel ! %end %builtin bool wxIsDragResultOk(wxDragResult res) --- 178,182 ---- wxDragMove wxDragCancel ! %endenum %builtin bool wxIsDragResultOk(wxDragResult res) *************** *** 211,219 **** %class %delete %noclassinfo %encapsulate wxDropSource %win wxDropSource(wxWindow* win = NULL, const wxCursor& iconCopy = wxNullCursor, const wxCursor& iconMove = wxNullCursor, const wxCursor& iconStop = wxNullCursor) ! %gtk wxDropSource(wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) ! %mac 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& iconCopy = wxNullCursor, const wxCursor& iconMove = wxNullCursor, const wxCursor& iconStop = wxNullCursor) ! %gtk %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) ! %mac %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) void SetData(wxDataObject& data) virtual wxDragResult DoDragDrop(bool allowMove = FALSE) --- 213,219 ---- %class %delete %noclassinfo %encapsulate wxDropSource %win wxDropSource(wxWindow* win = NULL, const wxCursor& iconCopy = wxNullCursor, const wxCursor& iconMove = wxNullCursor, const wxCursor& iconStop = wxNullCursor) ! %gtk|%mac 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& iconCopy = wxNullCursor, const wxCursor& iconMove = wxNullCursor, const wxCursor& iconStop = wxNullCursor) ! %gtk|%mac %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) void SetData(wxDataObject& data) virtual wxDragResult DoDragDrop(bool allowMove = FALSE) *************** *** 241,249 **** %if wxLUA_USE_wxMetafile %include "wx/metafile.h" //%builtin bool wxMakeMetafilePlaceable(const wxString& filename, int minX, int minY, int maxX, int maxY, float scale = 1.0) - %gtk %skip %class %noclassinfo wxMetafile, wxObject wxMetafile(const wxString& filename = "") --- 241,250 ---- %if wxLUA_USE_wxMetafile + %if %msw|%mac|%os2 + %include "wx/metafile.h" //%builtin 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 = "") *************** *** 255,260 **** /////////////////////////////////////////////////////////////////////////////// // wxMetafileDC - - %gtk %skip %class %delete %noclassinfo wxMetafileDC, wxDC wxMetafileDC(const wxString& filename = "") --- 256,259 ---- *************** *** 262,264 **** --- 261,265 ---- %endclass + %endif + %endif wxLUA_USE_wxMetafile Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** defsutil.i 6 Jun 2005 23:06:07 -0000 1.1 --- defsutil.i 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 24,30 **** // Process control functions ! %builtin long wxExecute(const wxString& command, bool sync = FALSE, wxProcess *callback = NULL) %builtin void wxExit() ! ~%wxver22 %builtin unsigned long wxGetProcessId() %builtin bool wxShell(const wxString& command = "") --- 24,31 ---- // Process control functions ! // FIXME add wxProcess %builtin long wxExecute(const wxString& command, bool sync = FALSE, wxProcess *callback = NULL) ! %builtin void wxExit() ! %wxchkver23 %builtin unsigned long wxGetProcessId() %builtin bool wxShell(const wxString& command = "") *************** *** 57,65 **** // GDI functions ! ~%wxver22 %builtin void wxClientDisplayRect(int *x, int *y, int *width, int *height) %builtin bool wxColourDisplay() %builtin int wxDisplayDepth() %builtin void wxDisplaySize(int *width, int *height) ! ~%wxver22 %builtin void wxDisplaySizeMM(int *width, int *height) %builtin void wxSetCursor(const wxCursor &cursor) // %builtin wxIconOrCursor wxDROP_ICON(wxString name) --- 58,66 ---- // GDI functions ! %wxchkver23 %builtin void wxClientDisplayRect(int *x, int *y, int *width, int *height) %builtin bool wxColourDisplay() %builtin int wxDisplayDepth() %builtin void wxDisplaySize(int *width, int *height) ! %wxchkver23 %builtin void wxDisplaySizeMM(int *width, int *height) %builtin void wxSetCursor(const wxCursor &cursor) // %builtin wxIconOrCursor wxDROP_ICON(wxString name) *************** *** 74,86 **** %builtin wxWindow* wxFindWindowByLabel(const wxString& label, wxWindow *parent=NULL) %builtin wxWindow* wxFindWindowByName(const wxString& name, wxWindow *parent=NULL) ! ~%wxver22 %builtin wxWindow* wxFindWindowAtPoint(const wxPoint& pt) ! ~%wxver22 %builtin wxWindow* wxFindWindowAtPointer(wxPoint& pt) %win %builtin wxWindow* wxGetActiveWindow() // X only %builtin wxString wxGetDisplayName() // X only %builtin void wxSetDisplayName(const wxString& displayName) ! ~%wxver22 %builtin wxPoint wxGetMousePosition() // %builtin bool wxGetResource(const wxString& section, const wxString& entry, const wxString& *value, const wxString& file = "") // %builtin bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file = "") ! ~%wxver22 %builtin wxWindow * wxGetTopLevelParent(wxWindow *win) //%win %builtin wxString wxLoadUserResource(const wxString& resourceName, const wxString& resourceType="TEXT") %builtin void wxPostEvent(wxEvtHandler *dest, wxEvent& event) --- 75,87 ---- %builtin wxWindow* wxFindWindowByLabel(const wxString& label, wxWindow *parent=NULL) %builtin wxWindow* wxFindWindowByName(const wxString& name, wxWindow *parent=NULL) ! %wxchkver23 %builtin wxWindow* wxFindWindowAtPoint(const wxPoint& pt) ! %wxchkver23 %builtin wxWindow* wxFindWindowAtPointer(wxPoint& pt) %win %builtin wxWindow* wxGetActiveWindow() // X only %builtin wxString wxGetDisplayName() // X only %builtin void wxSetDisplayName(const wxString& displayName) ! %wxchkver23 %builtin wxPoint wxGetMousePosition() // %builtin bool wxGetResource(const wxString& section, const wxString& entry, const wxString& *value, const wxString& file = "") // %builtin bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file = "") ! %wxchkver23 %builtin wxWindow * wxGetTopLevelParent(wxWindow *win) //%win %builtin wxString wxLoadUserResource(const wxString& resourceName, const wxString& resourceType="TEXT") %builtin void wxPostEvent(wxEvtHandler *dest, wxEvent& event) *************** *** 99,103 **** %define wxID_CLEAR %define wxID_CLOSE ! ~%wxver22 %define wxID_CONTEXT_HELP %define wxID_COPY %define wxID_CUT --- 100,104 ---- %define wxID_CLEAR %define wxID_CLOSE ! %wxchkver23 %define wxID_CONTEXT_HELP %define wxID_COPY %define wxID_CUT *************** *** 159,163 **** wxEAST wxALL ! %end %enum wxAlignment --- 160,164 ---- wxEAST wxALL ! %endenum %enum wxAlignment *************** *** 173,178 **** wxALIGN_CENTER wxALIGN_CENTRE ! ~%wxver22 wxALIGN_MASK ! %end %enum wxStretch --- 174,179 ---- wxALIGN_CENTER wxALIGN_CENTRE ! %wxchkver23 wxALIGN_MASK ! %endenum %enum wxStretch *************** *** 182,200 **** wxEXPAND wxSHAPED ! ~%wxver22 wxADJUST_MINSIZE ! ~%wxver22 wxTILE ! %end // border flags: the values are chosen for backwards compatibility ! ~%wxver22 %enum wxBorder ! ~%wxver22 wxBORDER_DEFAULT ! ~%wxver22 wxBORDER_NONE ! ~%wxver22 wxBORDER_STATIC ! ~%wxver22 wxBORDER_SIMPLE ! ~%wxver22 wxBORDER_RAISED ! ~%wxver22 wxBORDER_SUNKEN ! ~%wxver22 wxBORDER_DOUBLE ! ~%wxver22 wxBORDER_MASK ! ~%wxver22 %end %include "wx/txtstrm.h" --- 183,203 ---- wxEXPAND wxSHAPED ! %wxchkver23 wxADJUST_MINSIZE ! %wxchkver23 wxTILE ! %endenum // border flags: the values are chosen for backwards compatibility ! %if %wxchkver23 ! %enum wxBorder ! wxBORDER_DEFAULT ! wxBORDER_NONE ! wxBORDER_STATIC ! wxBORDER_SIMPLE ! wxBORDER_RAISED ! wxBORDER_SUNKEN ! wxBORDER_DOUBLE ! wxBORDER_MASK ! %endenum ! %endif %include "wx/txtstrm.h" *************** *** 204,206 **** wxEOL_MAC wxEOL_DOS ! %end --- 207,209 ---- wxEOL_MAC wxEOL_DOS ! %endenum Index: event.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** event.i 6 Jun 2005 23:06:07 -0000 1.1 --- event.i 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 44,48 **** %include "wx/event.h" ! ~<wxver23 %include "wx/tglbtn.h" // for wxEVT_COMMAND_TOGGLEBUTTON_CLICKED %class %delete wxCommandEvent, wxEvent --- 44,48 ---- %include "wx/event.h" ! %wxchkver24 %include "wx/tglbtn.h" // for wxEVT_COMMAND_TOGGLEBUTTON_CLICKED %class %delete wxCommandEvent, wxEvent *************** *** 66,71 **** %define %event wxEVT_COMMAND_TEXT_ENTER %define %event wxEVT_COMMAND_TEXT_UPDATED ! ~%wxver22 %define %event wxEVT_COMMAND_TEXT_URL ! ~%wxver22 %define %event wxEVT_COMMAND_TEXT_MAXLEN %define %event wxEVT_COMMAND_SPINCTRL_UPDATED --- 66,71 ---- %define %event wxEVT_COMMAND_TEXT_ENTER %define %event wxEVT_COMMAND_TEXT_UPDATED ! %wxchkver23 %define %event wxEVT_COMMAND_TEXT_URL ! %wxchkver23 %define %event wxEVT_COMMAND_TEXT_MAXLEN %define %event wxEVT_COMMAND_SPINCTRL_UPDATED *************** *** 80,84 **** %define %event wxEVT_COMMAND_CHECKBOX_CLICKED %define %event wxEVT_COMMAND_BUTTON_CLICKED ! ~<wxver23 %define %event wxEVT_COMMAND_TOGGLEBUTTON_CLICKED wxCommandEvent(wxEventType commandEventType = 0, int id = 0) --- 80,84 ---- %define %event wxEVT_COMMAND_CHECKBOX_CLICKED %define %event wxEVT_COMMAND_BUTTON_CLICKED ! %wxchkver24 %define %event wxEVT_COMMAND_TOGGLEBUTTON_CLICKED wxCommandEvent(wxEventType commandEventType = 0, int id = 0) *************** *** 147,152 **** // wxDialUpEvent - TODO - the rest of wxDialUp is missing, anyone care? %include "wx/dialup.h" ! %mac %skip %class %noclassinfo wxDialUpEvent, wxCommandEvent %define %event wxEVT_DIALUP_CONNECTED --- 147,153 ---- // wxDialUpEvent - TODO - the rest of wxDialUp is missing, any... [truncated message content] |
