Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.39, 1.40 clipdrag.i, 1.28, 1.29 controls.i, 1.40, 1.41 data.i, 1.34, 1.35 datetime.i, 1.31, 1.32 defsutil.i, 1.44, 1.45 dialogs.i, 1.34, 1.35 event.i, 1.27, 1.28 file.i, 1.25, 1.26 gdi.i, 1.53, 1.54 help.i, 1.18, 1.19 html.i, 1.24, 1.25 image.i, 1.28, 1.29 mdi.i, 1.16, 1.17 menutool.i, 1.21, 1.22 override.hpp, 1.77, 1.78 print.i, 1.19, 1.20 sizer.i, 1.14, 1.15 wave.i, 1.19, 1.20 windows.i, 1.42, 1.43 wx_datatypes.lua, 1.69, 1.70 xml.i, 1.13, 1.14
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7428/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i controls.i data.i datetime.i defsutil.i dialogs.i event.i file.i gdi.i help.i html.i image.i mdi.i menutool.i override.hpp print.i sizer.i wave.i windows.i wx_datatypes.lua xml.i Log Message: Add more classes from wxWidgets 2.8 Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wave.i 17 Jun 2007 17:17:37 -0000 1.19 --- wave.i 18 Jun 2007 02:56:24 -0000 1.20 *************** *** 40,44 **** // wxWave ! %if %msw & !%wxchkver_2_5 & wxUSE_WAVE %include "wx/wave.h" --- 40,44 ---- // wxWave ! %if %msw & !%wxchkver_2_6 & wxUSE_WAVE %include "wx/wave.h" *************** *** 50,58 **** bool Create(const wxString& fileName, bool isResource = false) bool IsOk() const ! !%wxchkver_2_5 bool Play(bool async = true, bool looped = false) const ! %wxchkver_2_5 bool Play(unsigned int flags = wxSOUND_ASYNC) const %endclass ! %endif // %msw & !%wxchkver_2_5 & wxUSE_WAVE %endif //wxLUA_USE_wxWave --- 50,58 ---- bool Create(const wxString& fileName, bool isResource = false) bool IsOk() const ! !%wxchkver_2_6 bool Play(bool async = true, bool looped = false) const ! %wxchkver_2_6 bool Play(unsigned int flags = wxSOUND_ASYNC) const %endclass ! %endif // %msw & !%wxchkver_2_6 & wxUSE_WAVE %endif //wxLUA_USE_wxWave Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** menutool.i 17 Jun 2007 17:17:37 -0000 1.21 --- menutool.i 18 Jun 2007 02:56:24 -0000 1.22 *************** *** 265,269 **** // wxToolBarSimple ! %if !%wxchkver_2_5 %include "wx/tbarsmpl.h" --- 265,269 ---- // wxToolBarSimple ! %if !%wxchkver_2_6 %include "wx/tbarsmpl.h" *************** *** 277,281 **** %endclass ! %endif // !%wxchkver_2_5 // --------------------------------------------------------------------------- --- 277,281 ---- %endclass ! %endif // !%wxchkver_2_6 // --------------------------------------------------------------------------- Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** clipdrag.i 17 Jun 2007 17:17:37 -0000 1.28 --- clipdrag.i 18 Jun 2007 02:56:23 -0000 1.29 *************** *** 16,21 **** %class wxClipboard, wxObject ! !%wxchkver_2_5 %define_pointer wxTheClipboard ! %wxchkver_2_5 static wxClipboard *Get() // wxClipboard() use global clipboard only --- 16,21 ---- %class wxClipboard, wxObject ! !%wxchkver_2_6 %define_pointer wxTheClipboard ! %wxchkver_2_6 static wxClipboard *Get() // wxClipboard() use global clipboard only Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** data.i 17 Jun 2007 17:17:37 -0000 1.34 --- data.i 18 Jun 2007 02:56:23 -0000 1.35 *************** *** 164,178 **** wxTextValidator(long style = wxFILTER_NONE, wxLuaObject* stringObj = NULL) ! %wxchkver_2_5 wxArrayString& GetExcludes() ! %wxchkver_2_5 wxArrayString& GetIncludes() long GetStyle() const void SetStyle(long style) ! %wxchkver_2_5 void SetIncludes(const wxArrayString& includes) ! %wxchkver_2_5 void SetExcludes(const wxArrayString& excludes) ! //!%wxchkver_2_5|%wxcompat_2_4 wxStringList& GetExcludeList() const ! //!%wxchkver_2_5|%wxcompat_2_4 wxStringList& GetIncludeList() const ! //!%wxchkver_2_5|%wxcompat_2_4 void SetExcludeList(const wxStringList& stringList) ! //!%wxchkver_2_5|%wxcompat_2_4 void SetIncludeList(const wxStringList& stringList) %endclass --- 164,178 ---- wxTextValidator(long style = wxFILTER_NONE, wxLuaObject* stringObj = NULL) ! %wxchkver_2_6 wxArrayString& GetExcludes() ! %wxchkver_2_6 wxArrayString& GetIncludes() long GetStyle() const void SetStyle(long style) ! %wxchkver_2_6 void SetIncludes(const wxArrayString& includes) ! %wxchkver_2_6 void SetExcludes(const wxArrayString& excludes) ! //!%wxchkver_2_6|%wxcompat_2_4 wxStringList& GetExcludeList() const ! //!%wxchkver_2_6|%wxcompat_2_4 wxStringList& GetIncludeList() const ! //!%wxchkver_2_6|%wxcompat_2_4 void SetExcludeList(const wxStringList& stringList) ! //!%wxchkver_2_6|%wxcompat_2_4 void SetIncludeList(const wxStringList& stringList) %endclass *************** *** 406,410 **** //%include "wx/hash.h" ! //%if %wxchkver_2_5 //%class %noclassinfo wxHashTable::Node //%endclass --- 406,410 ---- //%include "wx/hash.h" ! //%if %wxchkver_2_6 //%class %noclassinfo wxHashTable::Node //%endclass *************** *** 412,417 **** //%class %noclassinfo wxHashTable, wxObject ! // !%wxchkver_2_5 wxHashTable(unsigned int key_type, int size = 1000) ! // %wxchkver_2_5 wxHashTable(wxKeyType key_type, int size = 1000) // void BeginFind() // void Clear() --- 412,417 ---- //%class %noclassinfo wxHashTable, wxObject ! // !%wxchkver_2_6 wxHashTable(unsigned int key_type, int size = 1000) ! // %wxchkver_2_6 wxHashTable(wxKeyType key_type, int size = 1000) // void BeginFind() // void Clear() *************** *** 421,426 **** // wxObject * Get(const wxString &key) // long MakeKey(const wxString& string) ! // !%wxchkver_2_5 wxNode * Next() ! // %wxchkver_2_5 wxHashTable::Node * Next() // void Put(long key, wxObject *object) // void Put(const wxString & key, wxObject *object) --- 421,426 ---- // wxObject * Get(const wxString &key) // long MakeKey(const wxString& string) ! // !%wxchkver_2_6 wxNode * Next() ! // %wxchkver_2_6 wxHashTable::Node * Next() // void Put(long key, wxObject *object) // void Put(const wxString & key, wxObject *object) Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** wx_datatypes.lua 17 Jun 2007 18:36:06 -0000 1.69 --- wx_datatypes.lua 18 Jun 2007 02:56:25 -0000 1.70 *************** *** 238,241 **** --- 238,261 ---- Name = "wxAlignment", }, + wxAnimation = { + BaseClass = "wxGDIObject", + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "class", + IsNumber = false, + Name = "wxAnimation", + }, + wxAnimationCtrl = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "class", + IsNumber = false, + Name = "wxAnimationCtrl", + }, + wxAnimationType = { + Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8", + DefType = "enum", + IsNumber = true, + Name = "wxAnimationType", + }, wxApp = { BaseClass = "wxEvtHandler", *************** *** 245,248 **** --- 265,273 ---- Name = "wxApp", }, + wxArchitecture = { + DefType = "enum", + IsNumber = true, + Name = "wxArchitecture", + }, wxArrayInt = { Condition = "wxLUA_USE_wxArrayInt", *************** *** 299,302 **** --- 324,332 ---- Name = "wxBackgroundStyle", }, + wxBatteryState = { + DefType = "enum", + IsNumber = true, + Name = "wxBatteryState", + }, wxBestHelpController = { BaseClass = "wxHelpControllerBase", *************** *** 320,323 **** --- 350,360 ---- Name = "wxBitmapButton", }, + wxBitmapComboBox = { + BaseClass = "wxControlWithItems", + Condition = "wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX", + DefType = "class", + IsNumber = false, + Name = "wxBitmapComboBox", + }, wxBitmapDataObject = { BaseClass = "wxDataObjectSimple", *************** *** 568,571 **** --- 605,622 ---- Name = "wxCloseEvent", }, + wxCollapsiblePane = { + BaseClass = "wxControl", + Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", + DefType = "class", + IsNumber = false, + Name = "wxCollapsiblePane", + }, + wxCollapsiblePaneEvent = { + BaseClass = "wxCommandEvent", + Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE", + DefType = "class", + IsNumber = false, + Name = "wxCollapsiblePaneEvent", + }, wxColour = { BaseClass = "wxGDIObject", *************** *** 677,680 **** --- 728,737 ---- Name = "wxContextHelpButton", }, + wxContextMenuEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + IsNumber = false, + Name = "wxContextMenuEvent", + }, wxControl = { BaseClass = "wxWindow", *************** *** 916,919 **** --- 973,990 ---- Name = "wxDocChildFrame", }, + wxDocMDIChildFrame = { + BaseClass = "wxMDIChildFrame", + Condition = "wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE", + DefType = "class", + IsNumber = false, + Name = "wxDocMDIChildFrame", + }, + wxDocMDIParentFrame = { + BaseClass = "wxMDIParentFrame", + Condition = "wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE", + DefType = "class", + IsNumber = false, + Name = "wxDocMDIParentFrame", + }, wxDocManager = { BaseClass = "wxEvtHandler", *************** *** 999,1002 **** --- 1070,1078 ---- Name = "wxEffects", }, + wxEndianness = { + DefType = "enum", + IsNumber = true, + Name = "wxEndianness", + }, wxEraseEvent = { BaseClass = "wxEvent", *************** *** 1143,1146 **** --- 1219,1240 ---- Name = "wxFilePickerCtrl", }, + wxFileType = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileType", + }, + ["wxFileType::MessageParameters"] = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileType::MessageParameters", + }, + wxFileTypeInfo = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxFileTypeInfo", + }, wxFindDialogEvent = { BaseClass = "wxCommandEvent", *************** *** 1736,1740 **** }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, --- 1830,1834 ---- }, wxHtmlWindowInterface = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, *************** *** 1742,1746 **** }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "enum", IsNumber = true, --- 1836,1840 ---- }, ["wxHtmlWindowInterface::HTMLCursor"] = { ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "enum", IsNumber = true, *************** *** 2302,2305 **** --- 2396,2405 ---- Name = "wxMetafileDC", }, + wxMimeTypesManager = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxMimeTypesManager", + }, wxMiniFrame = { BaseClass = "wxFrame", *************** *** 2336,2340 **** }, wxMouseState = { ! Condition = "wxCHECK_VERSION(2,7,0)", DefType = "class", Encapsulate = true, --- 2436,2440 ---- }, wxMouseState = { ! Condition = "wxCHECK_VERSION(2,8,0)", DefType = "class", Encapsulate = true, *************** *** 2395,2399 **** wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,5,0))) && (wxLUA_USE_wxSizer)", DefType = "class", IsNumber = false, --- 2495,2499 ---- wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0))) && (wxLUA_USE_wxSizer)", DefType = "class", IsNumber = false, *************** *** 2418,2421 **** --- 2518,2526 ---- Name = "wxObjectRefData", }, + wxOperatingSystemId = { + DefType = "enum", + IsNumber = true, + Name = "wxOperatingSystemId", + }, wxOrientation = { DefType = "enum", *************** *** 2556,2559 **** --- 2661,2670 ---- Name = "wxPickerBase", }, + wxPlatformInfo = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxPlatformInfo", + }, wxPoint = { Condition = "wxLUA_USE_wxPointSizeRect", *************** *** 2577,2580 **** --- 2688,2696 ---- Name = "wxPoint2DInt", }, + wxPortId = { + DefType = "enum", + IsNumber = true, + Name = "wxPortId", + }, wxPostScriptDC = { BaseClass = "wxDC", *************** *** 2584,2587 **** --- 2700,2715 ---- Name = "wxPostScriptDC", }, + wxPowerEvent = { + BaseClass = "wxEvent", + Condition = "wxHAS_POWER_EVENTS", + DefType = "class", + IsNumber = false, + Name = "wxPowerEvent", + }, + wxPowerType = { + DefType = "enum", + IsNumber = true, + Name = "wxPowerType", + }, wxPreviewCanvas = { BaseClass = "wxWindow", *************** *** 2606,2610 **** }, wxPrintBin = { ! Condition = "(wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)", DefType = "enum", IsNumber = true, --- 2734,2738 ---- }, wxPrintBin = { ! Condition = "(wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE)", DefType = "enum", IsNumber = true, *************** *** 2724,2727 **** --- 2852,2862 ---- Name = "wxProtocolError", }, + wxQuantize = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", + DefType = "class", + IsNumber = false, + Name = "wxQuantize", + }, wxQueryLayoutInfoEvent = { BaseClass = "wxEvent", *************** *** 2905,2909 **** wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, --- 3040,3044 ---- wxSimpleHtmlListBox = { BaseClass = "wxHtmlWindowInterface", ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML)", DefType = "class", IsNumber = false, *************** *** 3372,3376 **** wxToolBarSimple = { BaseClass = "wxToolBarBase", ! Condition = "(!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar)", DefType = "class", IsNumber = false, --- 3507,3511 ---- wxToolBarSimple = { BaseClass = "wxToolBarBase", ! Condition = "(!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxToolbar)", DefType = "class", IsNumber = false, *************** *** 3574,3578 **** wxWave = { BaseClass = "wxObject", ! Condition = "(defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)", DefType = "class", IsNumber = false, --- 3709,3713 ---- wxWave = { BaseClass = "wxObject", ! Condition = "(defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)", DefType = "class", IsNumber = false, *************** *** 3762,3769 **** ["%wince"] = "defined(__WXWINCE__)", ["%wxchkver_2_4"] = "wxCHECK_VERSION(2,4,0)", - ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)", ["%wxchkver_2_6"] = "wxCHECK_VERSION(2,6,0)", ["%wxchkver_2_6_4"] = "wxCHECK_VERSION(2,6,4)", - ["%wxchkver_2_7"] = "wxCHECK_VERSION(2,7,0)", ["%wxchkver_2_8"] = "wxCHECK_VERSION(2,8,0)", ["%wxchkver_2_8_1"] = "wxCHECK_VERSION(2,8,1)", --- 3897,3902 ---- *************** *** 3776,3779 **** --- 3909,3914 ---- WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", + wxHAS_POWER_EVENTS = "wxHAS_POWER_EVENTS", + wxLUA_USE_Animation = "wxLUA_USE_Animation", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_Geometry = "wxLUA_USE_Geometry", *************** *** 3787,3790 **** --- 3922,3926 ---- wxLUA_USE_wxBitmap = "wxLUA_USE_wxBitmap", wxLUA_USE_wxBitmapButton = "wxLUA_USE_wxBitmapButton", + wxLUA_USE_wxBitmapComboBox = "wxLUA_USE_wxBitmapComboBox", wxLUA_USE_wxBrushList = "wxLUA_USE_wxBrushList", wxLUA_USE_wxBusyCursor = "wxLUA_USE_wxBusyCursor", *************** *** 3798,3801 **** --- 3934,3938 ---- wxLUA_USE_wxClassInfo = "wxLUA_USE_wxClassInfo", wxLUA_USE_wxClipboard = "wxLUA_USE_wxClipboard", + wxLUA_USE_wxCollapsiblePane = "wxLUA_USE_wxCollapsiblePane", wxLUA_USE_wxColourDialog = "wxLUA_USE_wxColourDialog", wxLUA_USE_wxColourPenBrush = "wxLUA_USE_wxColourPenBrush", *************** *** 3911,3915 **** --- 4048,4054 ---- wxUSE_ACCESSIBILITY = "wxUSE_ACCESSIBILITY", wxUSE_AFM_FOR_POSTSCRIPT = "wxUSE_AFM_FOR_POSTSCRIPT", + wxUSE_ANIMATIONCTRL = "wxUSE_ANIMATIONCTRL", wxUSE_APPLE_IEEE = "wxUSE_APPLE_IEEE", + wxUSE_BITMAPCOMBOBOX = "wxUSE_BITMAPCOMBOBOX", wxUSE_BMPBUTTON = "wxUSE_BMPBUTTON", wxUSE_BOOKCTRL = "wxUSE_BOOKCTRL", *************** *** 3926,3929 **** --- 4065,4069 ---- wxUSE_CLIPBOARD = "wxUSE_CLIPBOARD", wxUSE_CMDLINE_PARSER = "wxUSE_CMDLINE_PARSER", + wxUSE_COLLPANE = "wxUSE_COLLPANE", wxUSE_COLOURDLG = "wxUSE_COLOURDLG", wxUSE_COLOURPICKERCTRL = "wxUSE_COLOURPICKERCTRL", Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** print.i 17 Jun 2007 17:17:37 -0000 1.19 --- print.i 18 Jun 2007 02:56:24 -0000 1.20 *************** *** 229,233 **** %endenum ! %if %wxchkver_2_5 %enum wxPrintBin wxPRINTBIN_DEFAULT --- 229,233 ---- %endenum ! %if %wxchkver_2_6 %enum wxPrintBin wxPRINTBIN_DEFAULT *************** *** 291,312 **** // these are all WXWIN_COMPATIBILITY_2_4 and for postscript printing only ! //!%wxchkver_2_7 wxString GetPrinterCommand() ! //!%wxchkver_2_7 wxString GetPrinterOptions() ! //!%wxchkver_2_7 wxString GetPreviewCommand() ! //!%wxchkver_2_7 const wxString& GetFontMetricPath() ! //!%wxchkver_2_7 double GetPrinterScaleX() ! //!%wxchkver_2_7 double GetPrinterScaleY() ! //!%wxchkver_2_7 long GetPrinterTranslateX() ! //!%wxchkver_2_7 long GetPrinterTranslateY() ! //!%wxchkver_2_7 void SetPrinterCommand(const wxString& command) ! //!%wxchkver_2_7 void SetPrinterOptions(const wxString& options) ! //!%wxchkver_2_7 void SetPreviewCommand(const wxString& command) ! //!%wxchkver_2_7 void SetFontMetricPath(const wxString& path) ! //!%wxchkver_2_7 void SetPrinterScaleX(double x) ! //!%wxchkver_2_7 void SetPrinterScaleY(double y) ! //!%wxchkver_2_7 void SetPrinterScaling(double x, double y) ! //!%wxchkver_2_7 void SetPrinterTranslateX(long x) ! //!%wxchkver_2_7 void SetPrinterTranslateY(long y) ! //!%wxchkver_2_7 void SetPrinterTranslation(long x, long y) %endclass --- 291,312 ---- // these are all WXWIN_COMPATIBILITY_2_4 and for postscript printing only ! //!%wxchkver_2_8 wxString GetPrinterCommand() ! //!%wxchkver_2_8 wxString GetPrinterOptions() ! //!%wxchkver_2_8 wxString GetPreviewCommand() ! //!%wxchkver_2_8 const wxString& GetFontMetricPath() ! //!%wxchkver_2_8 double GetPrinterScaleX() ! //!%wxchkver_2_8 double GetPrinterScaleY() ! //!%wxchkver_2_8 long GetPrinterTranslateX() ! //!%wxchkver_2_8 long GetPrinterTranslateY() ! //!%wxchkver_2_8 void SetPrinterCommand(const wxString& command) ! //!%wxchkver_2_8 void SetPrinterOptions(const wxString& options) ! //!%wxchkver_2_8 void SetPreviewCommand(const wxString& command) ! //!%wxchkver_2_8 void SetFontMetricPath(const wxString& path) ! //!%wxchkver_2_8 void SetPrinterScaleX(double x) ! //!%wxchkver_2_8 void SetPrinterScaleY(double y) ! //!%wxchkver_2_8 void SetPrinterScaling(double x, double y) ! //!%wxchkver_2_8 void SetPrinterTranslateX(long x) ! //!%wxchkver_2_8 void SetPrinterTranslateY(long y) ! //!%wxchkver_2_8 void SetPrinterTranslation(long x, long y) %endclass Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** file.i 17 Jun 2007 17:17:37 -0000 1.25 --- file.i 18 Jun 2007 02:56:24 -0000 1.26 *************** *** 49,54 **** // These two methods are for wxLua - // %override wxFILE_SEP_PATH wxFileSeparator() - returns either / or \ depending on platform - %function wxString wxFileSeparator() // %override long wxFileSize(const wxString& fileName) - gets the filesize %function long wxFileSize(const wxString& fileName) --- 49,52 ---- *************** *** 75,79 **** %function bool wxEndsWithPathSeparator(const wxString& pszFileName) - // --------------------------------------------------------------------------- // wxPathList --- 73,76 ---- *************** *** 114,119 **** %define wxPATH_MKDIR_FULL - //%define_string wxFILE_SEP_PATH // this is wxChar see override wxFileSeparator - //%define_string wxPATH_SEP // this is wxChar see override wxFileSeparator %define wxFILE %define wxDIR --- 111,114 ---- *************** *** 432,435 **** --- 427,584 ---- // --------------------------------------------------------------------------- + // wxFileTypeInfo + + %include "wx/mimetype.h" + + %class %delete %noclassinfo %encapsulate wxFileTypeInfo + // the ... parameters form a NULL terminated list of extensions + //wxFileTypeInfo(const wxChar *mimeType, const wxChar *openCmd, const wxChar *printCmd, const wxChar *desc, ...) + // the array elements correspond to the parameters of the ctor above in the same order + wxFileTypeInfo(const wxArrayString& sArray) + + // invalid item - use this to terminate the array passed to wxMimeTypesManager::AddFallbacks + wxFileTypeInfo() + + bool IsValid() const + + void SetIcon(const wxString& iconFile, int iconIndex = 0) + void SetShortDesc(const wxString& shortDesc) + + wxString GetMimeType() const + wxString GetOpenCommand() const + wxString GetPrintCommand() const + wxString GetShortDesc() const + wxString GetDescription() const + wxArrayString GetExtensions() const + size_t GetExtensionsCount() const + wxString GetIconFile() const + int GetIconIndex() const + %endclass + + // --------------------------------------------------------------------------- + // wxFileType::MessageParameters + + %class %delete %noclassinfo %encapsulate wxFileType::MessageParameters + //wxFileType::MessageParameters() + wxFileType::MessageParameters(const wxString& filename, const wxString& mimetype = "") + + // accessors (called by GetOpenCommand) + wxString GetFileName() const + wxString GetMimeType() const + + // override this function in derived class + virtual wxString GetParamValue(const wxString& name) const + %endclass + + // --------------------------------------------------------------------------- + // wxFileType + + %class %delete %noclassinfo %encapsulate wxFileType + wxFileType(const wxFileTypeInfo& ftInfo) + + // accessors: all of them return true if the corresponding information + // could be retrieved/found, false otherwise (and in this case all [out] parameters are unchanged) + + // return the MIME type for this file type + //bool GetMimeType(wxString *mimeType) const; + bool GetMimeTypes(wxArrayString& mimeTypes) const; + + bool GetExtensions(wxArrayString& extensions); + + // get the icon corresponding to this file type and of the given size + bool GetIcon(wxIconLocation *iconloc) const; + //bool GetIcon(wxIconLocation *iconloc, const wxFileType::MessageParameters& params) const; + + // get a brief file type description ("*.txt" => "text document") + // %override [bool lua string] GetDescription() const; + // C++ Func: bool GetDescription(wxString *desc) const + bool GetDescription() const + + // get the command to be used to open/print the given file. + //bool GetOpenCommand(wxString *openCmd, const wxFileType::MessageParameters& params) const; + // a simpler to use version of GetOpenCommand() -- it only takes the + // filename and returns an empty string on failure + wxString GetOpenCommand(const wxString& filename) const; + + // get the command to print the file of given type + // %override [bool lua string] GetPrintCommand(const wxFileType::MessageParameters& params) const; + // C++ Func: bool GetPrintCommand(wxString *printCmd, const wxFileType::MessageParameters& params) const; + bool GetPrintCommand(const wxFileType::MessageParameters& params) const; + + // return the number of commands defined for this file type, 0 if none + size_t GetAllCommands(wxArrayString *verbs, wxArrayString *commands, const wxFileType::MessageParameters& params) const; + + // set an arbitrary command, ask confirmation if it already exists and overwriteprompt is true + bool SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt = true) + + bool SetDefaultIcon(const wxString& cmd = "", int index = 0) + + // remove the association for this filetype from the system MIME database: + // notice that it will only work if the association is defined in the user + // file/registry part, we will never modify the system-wide settings + bool Unassociate(); + + // expand a string in the format of GetOpenCommand (which may contain + // '%s' and '%t' format specificators for the file name and mime type + // and %{param} constructions). + static wxString ExpandCommand(const wxString& command, const wxFileType::MessageParameters& params); + %endclass + + // --------------------------------------------------------------------------- + // wxMimeTypesManager + + %class %noclassinfo %encapsulate wxMimeTypesManager + %define_pointer wxTheMimeTypesManager + + // wxMimeTypesManager(); - Use pointer wxTheMimeTypesManager + + // check if the given MIME type is the same as the other one: the + // second argument may contain wildcards ('*'), but not the first. If + // the types are equal or if the mimeType matches wildcard the function + // returns true, otherwise it returns false + static bool IsOfType(const wxString& mimeType, const wxString& wildcard); + + // NB: the following 2 functions are for Unix only and don't do anything elsewhere + + // loads data from standard files according to the mailcap styles + // specified: this is a bitwise OR of wxMailcapStyle values + // + // use the extraDir parameter if you want to look for files in another + // directory + void Initialize(int mailcapStyle = wxMAILCAP_ALL, const wxString& extraDir = ""); + // and this function clears all the data from the manager + void ClearData(); + + // Database lookup: all functions return a pointer to wxFileType object + // whose methods may be used to query it for the information you're + // interested in. If the return value is !NULL, caller is responsible for + // deleting it. + // get file type from file extension + wxFileType *GetFileTypeFromExtension(const wxString& ext); + // get file type from MIME type (in format <category>/<format>) + wxFileType *GetFileTypeFromMimeType(const wxString& mimeType); + + bool ReadMailcap(const wxString& filename, bool fallback = false); + // read in additional file in mime.types format + bool ReadMimeTypes(const wxString& filename); + + // enumerate all known MIME types returns the number of retrieved file types + size_t EnumAllFileTypes(wxArrayString& mimetypes); + + // The filetypes array should be terminated by either NULL entry or an + // invalid wxFileTypeInfo (i.e. the one created with default ctor) + //void AddFallbacks(const wxFileTypeInfo *filetypes); + void AddFallback(const wxFileTypeInfo& ft) + + // create a new association using the fields of wxFileTypeInfo (at least + // the MIME type and the extension should be set) + // if the other fields are empty, the existing values should be left alone + wxFileType *Associate(const wxFileTypeInfo& ftInfo) + + // undo Associate() + bool Unassociate(wxFileType *ft) + %endclass + + // --------------------------------------------------------------------------- // wxStreamBase *************** *** 459,463 **** // wxStreamBase() this is only a base class ! %wxchkver_2_5 wxFileOffset GetLength() const wxStreamError GetLastError() const size_t GetSize() const --- 608,612 ---- // wxStreamBase() this is only a base class ! %wxchkver_2_6 wxFileOffset GetLength() const wxStreamError GetLastError() const size_t GetSize() const Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** dialogs.i 17 Jun 2007 17:17:37 -0000 1.34 --- dialogs.i 18 Jun 2007 02:56:23 -0000 1.35 *************** *** 64,68 **** %if wxUSE_NUMBERDLG ! %wxchkver_2_5 %include "wx/numdlg.h" // FIXME not in 2.4 %function long wxGetNumberFromUser(const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition) %endif // wxUSE_NUMBERDLG --- 64,68 ---- %if wxUSE_NUMBERDLG ! %wxchkver_2_6 %include "wx/numdlg.h" // FIXME not in 2.4 %function long wxGetNumberFromUser(const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition) %endif // wxUSE_NUMBERDLG *************** *** 253,257 **** void GetPaths() const ! !%wxchkver_2_7 long GetStyle() const wxString GetWildcard() const void SetDirectory(const wxString& directory) --- 253,257 ---- void GetPaths() const ! !%wxchkver_2_8 long GetStyle() const wxString GetWildcard() const void SetDirectory(const wxString& directory) *************** *** 260,264 **** void SetMessage(const wxString& message) void SetPath(const wxString& path) ! !%wxchkver_2_7 void SetStyle(long style) void SetWildcard(const wxString& wildCard) // int ShowModal() - in wxDialog --- 260,264 ---- void SetMessage(const wxString& message) void SetPath(const wxString& path) ! !%wxchkver_2_8 void SetStyle(long style) void SetWildcard(const wxString& wildCard) // int ShowModal() - in wxDialog *************** *** 284,291 **** wxString GetPath() const wxString GetMessage() const ! !%wxchkver_2_7 long GetStyle() const void SetMessage(const wxString& message) void SetPath(const wxString& path) ! !%wxchkver_2_7 void SetStyle(long style) // int ShowModal() - in wxDialog %endclass --- 284,291 ---- wxString GetPath() const wxString GetMessage() const ! !%wxchkver_2_8 long GetStyle() const void SetMessage(const wxString& message) void SetPath(const wxString& path) ! !%wxchkver_2_8 void SetStyle(long style) // int ShowModal() - in wxDialog %endclass Index: xml.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/xml.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** xml.i 17 Jun 2007 17:17:37 -0000 1.13 --- xml.i 18 Jun 2007 02:56:25 -0000 1.14 *************** *** 9,14 **** %if wxLUA_USE_wxXMLResource & wxUSE_XML ! !%wxchkver_2_5 %include "wx/xrc/xml.h" ! %wxchkver_2_5 %include "wx/xml/xml.h" %include "wx/xrc/xmlres.h" --- 9,14 ---- %if wxLUA_USE_wxXMLResource & wxUSE_XML ! !%wxchkver_2_6 %include "wx/xrc/xml.h" ! %wxchkver_2_6 %include "wx/xml/xml.h" %include "wx/xrc/xmlres.h" Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** windows.i 17 Jun 2007 17:17:37 -0000 1.42 --- windows.i 18 Jun 2007 02:56:24 -0000 1.43 *************** *** 82,91 **** void Center(int direction = wxBOTH) void CenterOnParent(int direction = wxBOTH) ! !%wxchkver_2_7 void CenterOnScreen(int direction = wxBOTH) void Centre(int direction = wxBOTH) void CentreOnParent(int direction = wxBOTH) ! !%wxchkver_2_7 void CentreOnScreen(int direction = wxBOTH) ! !%wxchkver_2_5 void Clear() ! %wxchkver_2_5 void ClearBackground() // %override [int x, int y] ClientToScreen(int x, int y) const --- 82,91 ---- void Center(int direction = wxBOTH) void CenterOnParent(int direction = wxBOTH) ! !%wxchkver_2_8 void CenterOnScreen(int direction = wxBOTH) void Centre(int direction = wxBOTH) void CentreOnParent(int direction = wxBOTH) ! !%wxchkver_2_8 void CentreOnScreen(int direction = wxBOTH) ! !%wxchkver_2_6 void Clear() ! %wxchkver_2_6 void ClearBackground() // %override [int x, int y] ClientToScreen(int x, int y) const *************** *** 117,121 **** wxAcceleratorTable* GetAcceleratorTable() const //wxAccessible* GetAccessible() ! !%wxchkver_2_7 wxSize GetAdjustedBestSize() const virtual wxColour GetBackgroundColour() const virtual wxBackgroundStyle GetBackgroundStyle() const --- 117,121 ---- wxAcceleratorTable* GetAcceleratorTable() const //wxAccessible* GetAccessible() ! !%wxchkver_2_8 wxSize GetAdjustedBestSize() const virtual wxColour GetBackgroundColour() const virtual wxBackgroundStyle GetBackgroundStyle() const *************** *** 138,142 **** wxCursor GetCursor() const //virtual wxVisualAttributes GetDefaultAttributes() const ! !%wxchkver_2_7 wxWindow* GetDefaultItem() const wxDropTarget* GetDropTarget() const wxEvtHandler* GetEventHandler() const --- 138,142 ---- wxCursor GetCursor() const //virtual wxVisualAttributes GetDefaultAttributes() const ! !%wxchkver_2_8 wxWindow* GetDefaultItem() const wxDropTarget* GetDropTarget() const wxEvtHandler* GetEventHandler() const *************** *** 183,187 **** virtual void GetTextExtent(const wxString& string, const wxFont* font = NULL ) const ! !%wxchkver_2_7 virtual wxString GetTitle() wxToolTip* GetToolTip() const virtual wxRegion GetUpdateRegion() const --- 183,187 ---- virtual void GetTextExtent(const wxString& string, const wxFont* font = NULL ) const ! !%wxchkver_2_8 virtual wxString GetTitle() wxToolTip* GetToolTip() const virtual wxRegion GetUpdateRegion() const *************** *** 251,255 **** virtual void SetCursor(const wxCursor& cursor) !%wxchkver_2_6 void SetConstraints(wxLayoutConstraints* constraints) ! !%wxchkver_2_7 wxWindow* SetDefaultItem(wxWindow *win) // virtual void SetInitialBestSize(const wxSize& size) protected void SetMaxSize(const wxSize& size) --- 251,255 ---- virtual void SetCursor(const wxCursor& cursor) !%wxchkver_2_6 void SetConstraints(wxLayoutConstraints* constraints) ! !%wxchkver_2_8 wxWindow* SetDefaultItem(wxWindow *win) // virtual void SetInitialBestSize(const wxSize& size) protected void SetMaxSize(const wxSize& size) *************** *** 280,284 **** void SetSizer(wxSizer* sizer, bool deleteOld=true) void SetSizerAndFit(wxSizer* sizer, bool deleteOld=true) ! !%wxchkver_2_7 virtual void SetTitle(const wxString& title) virtual void SetThemeEnabled(bool enable) void SetToolTip(const wxString& tip) --- 280,284 ---- void SetSizer(wxSizer* sizer, bool deleteOld=true) void SetSizerAndFit(wxSizer* sizer, bool deleteOld=true) ! !%wxchkver_2_8 virtual void SetTitle(const wxString& title) virtual void SetThemeEnabled(bool enable) void SetToolTip(const wxString& tip) *************** *** 329,335 **** bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "wxPanel") ! //!%wxchkver_2_7 wxWindow* GetDefaultItem() const - see wxWindow // void InitDialog() see wxWindow ! //!%wxchkver_2_7 wxWindow* SetDefaultItem(wxWindow *win) - see wxWindow //virtual void SetFocus() - see wxWindow virtual void SetFocusIgnoringChildren() --- 329,335 ---- bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "wxPanel") ! //!%wxchkver_2_8 wxWindow* GetDefaultItem() const - see wxWindow // void InitDialog() see wxWindow ! //!%wxchkver_2_8 wxWindow* SetDefaultItem(wxWindow *win) - see wxWindow //virtual void SetFocus() - see wxWindow virtual void SetFocusIgnoringChildren() *************** *** 442,446 **** %include "wx/notebook.h" ! //%if !%wxchkver_2_7|%wxcompat_2_6 %define wxNB_TOP // use wxBK_XXX after 2.6 %define wxNB_LEFT --- 442,446 ---- %include "wx/notebook.h" ! //%if !%wxchkver_2_8|%wxcompat_2_6 %define wxNB_TOP // use wxBK_XXX after 2.6 %define wxNB_LEFT *************** *** 450,454 **** %define wxNB_MULTILINE %define wxNB_NOPAGETHEME ! //%endif // !%wxchkver_2_7|%wxcompat_2_6 %enum --- 450,454 ---- %define wxNB_MULTILINE %define wxNB_NOPAGETHEME ! //%endif // !%wxchkver_2_8|%wxcompat_2_6 %enum *************** *** 910,913 **** --- 910,952 ---- %endif //wxLUA_USE_wxSplitterWindow + + // --------------------------------------------------------------------------- + // wxCollapsiblePane + + %if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + + %include "wx/collpane.h" + + %define wxCP_DEFAULT_STYLE + + %class wxCollapsiblePane, wxControl + wxCollapsiblePane() + wxCollapsiblePane(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCollapsiblePane") + + bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCollapsiblePane") + + bool IsCollapsed() const + bool IsExpanded() const + void Collapse(bool collapse = true) + void Expand() + wxWindow* GetPane() const + + %endclass + + // --------------------------------------------------------------------------- + // wxCollapsiblePaneEvent + + %class %delete wxCollapsiblePaneEvent, wxCommandEvent + %define wxEVT_COMMAND_COLLPANE_CHANGED // EVT_COLLAPSIBLEPANE_CHANGED(id, fn) + + wxCollapsiblePaneEvent() + wxCollapsiblePaneEvent(wxObject *generator, int id, bool collapsed) + + bool GetCollapsed() const + void SetCollapsed(bool c) + %endclass + + %endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE + // --------------------------------------------------------------------------- // wxStaticBox Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** gdi.i 17 Jun 2007 17:17:37 -0000 1.53 --- gdi.i 18 Jun 2007 02:56:24 -0000 1.54 *************** *** 93,99 **** %wxchkver_2_8 wxRect CentreIn(const wxRect& r, int dir = wxBOTH) const // CenterIn ! %wxchkver_2_7 bool Contains(wxCoord dx, wxCoord dy) const ! %wxchkver_2_7 bool Contains(const wxPoint& pt) const ! %wxchkver_2_7 bool Contains(const wxRect& rect) const wxRect Deflate(wxCoord dx, wxCoord dy) const //wxRect& Deflate(wxCoord dx, wxCoord dy) int GetBottom() --- 93,99 ---- %wxchkver_2_8 wxRect CentreIn(const wxRect& r, int dir = wxBOTH) const // CenterIn ! %wxchkver_2_8 bool Contains(wxCoord dx, wxCoord dy) const ! %wxchkver_2_8 bool Contains(const wxPoint& pt) const ! %wxchkver_2_8 bool Contains(const wxRect& rect) const wxRect Deflate(wxCoord dx, wxCoord dy) const //wxRect& Deflate(wxCoord dx, wxCoord dy) int GetBottom() *************** *** 507,514 **** virtual bool EnumerateEncodings( const wxString &font = "" ) ! %wxchkver_2_7 static wxArrayString GetEncodings(const wxString& facename = "") ! %wxchkver_2_7 static wxArrayString GetFacenames(wxFontEncoding encoding = wxFONTENCODING_SYSTEM, bool fixedWidthOnly = false) ! !%wxchkver_2_7 wxArrayString* GetEncodings() ! !%wxchkver_2_7 wxArrayString* GetFacenames() // Use GetEncodings/Facenames after calling EnumerateXXX --- 507,514 ---- virtual bool EnumerateEncodings( const wxString &font = "" ) ! %wxchkver_2_8 static wxArrayString GetEncodings(const wxString& facename = "") ! %wxchkver_2_8 static wxArrayString GetFacenames(wxFontEncoding encoding = wxFONTENCODING_SYSTEM, bool fixedWidthOnly = false) ! !%wxchkver_2_8 wxArrayString* GetEncodings() ! !%wxchkver_2_8 wxArrayString* GetFacenames() // Use GetEncodings/Facenames after calling EnumerateXXX *************** *** 566,570 **** void SetDialogTitle(const wxString &title) static wxFontMapper *Set(wxFontMapper *mapper) ! !%wxchkver_2_7 void SetConfig(wxConfigBase *config = NULL) void SetConfigPath(const wxString &prefix) %endclass --- 566,570 ---- void SetDialogTitle(const wxString &title) static wxFontMapper *Set(wxFontMapper *mapper) ! !%wxchkver_2_8 void SetConfig(wxConfigBase *config = NULL) void SetConfigPath(const wxString &prefix) %endclass *************** *** 873,877 **** //wxIcon(int width, int height, int depth = -1) // constructor does not exist ! %win|%mac|%wxchkver_2_5 void CopyFromBitmap(const wxBitmap& bmp) int GetDepth() int GetHeight() --- 873,877 ---- //wxIcon(int width, int height, int depth = -1) // constructor does not exist ! %win|%mac|%wxchkver_2_6 void CopyFromBitmap(const wxBitmap& bmp) int GetDepth() int GetHeight() *************** *** 941,945 **** //%win %class %delete %noclassinfo wxGDIImageHandler //%endclass ! //%wxchkver_2_5&%win %class %noclassinfo wxGDIImageHandlerList, wxList //%endclass --- 941,945 ---- //%win %class %delete %noclassinfo wxGDIImageHandler //%endclass ! //%wxchkver_2_6&%win %class %noclassinfo wxGDIImageHandlerList, wxList //%endclass *************** *** 970,975 **** //static wxBitmapHandler* FindHandler(wxBitmapType bitmapType) int GetDepth() const ! //%wxchkver_2_5&%win static wxGDIImageHandlerList& GetHandlers() ! //!%wxchkver_2_5&%win static wxList& GetHandlers() int GetHeight() const wxPalette* GetPalette() const --- 970,975 ---- //static wxBitmapHandler* FindHandler(wxBitmapType bitmapType) int GetDepth() const ! //%wxchkver_2_6&%win static wxGDIImageHandlerList& GetHandlers() ! //!%wxchkver_2_6&%win static wxList& GetHandlers() int GetHeight() const wxPalette* GetPalette() const *************** *** 1657,1658 **** --- 1657,1715 ---- %endclass + + // --------------------------------------------------------------------------- + // wxAnimation + + %if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 + + %include "wx/animate.h" + + %enum wxAnimationType + wxANIMATION_TYPE_INVALID + wxANIMATION_TYPE_GIF + wxANIMATION_TYPE_ANI + + wxANIMATION_TYPE_ANY + %endenum + + %class wxAnimation, wxGDIObject + wxAnimation() + wxAnimation(const wxAnimation& anim) + wxAnimation(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY) + + virtual bool IsOk() const + virtual int GetDelay(unsigned int frame) const // can be -1 + virtual unsigned int GetFrameCount() const + virtual wxImage GetFrame(unsigned int frame) const + virtual wxSize GetSize() const + + virtual bool LoadFile(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY) + virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) + %endclass + + // --------------------------------------------------------------------------- + // wxAnimationCtrl + + %define wxAC_NO_AUTORESIZE + %define wxAC_DEFAULT_STYLE + + %class wxAnimationCtrl, wxControl + wxAnimationCtrl() + wxAnimationCtrl(wxWindow *parent, wxWindowID id, const wxAnimation& anim, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxAC_DEFAULT_STYLE, const wxString& name = "wxAnimationCtrl") + bool Create(wxWindow *parent, wxWindowID id, const wxAnimation& anim, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxAC_DEFAULT_STYLE, const wxString& name = "wxAnimationCtrl") + + virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) + + wxAnimation GetAnimation() const + // always return the original bitmap set in this control + wxBitmap GetInactiveBitmap() const + virtual bool IsPlaying() const + bool LoadFile(const wxString & file, wxAnimationType animType = wxANIMATION_TYPE_ANY) + virtual bool Play() + virtual void SetAnimation(const wxAnimation &anim) + virtual void SetInactiveBitmap(const wxBitmap &bmp) + virtual void Stop() + + %endclass + + %endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8 Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** html.i 17 Jun 2007 17:17:37 -0000 1.24 --- html.i 18 Jun 2007 02:56:24 -0000 1.25 *************** *** 26,34 **** // %override bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) // C++ Func: bool AdjustPagebreak(int pagebreak, int* known_pagebreaks, int number_of_pages) ! %not_overload !%wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) // %override bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) // C++ Func: bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) ! %not_overload %wxchkver_2_7 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info) --- 26,34 ---- // %override bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) // C++ Func: bool AdjustPagebreak(int pagebreak, int* known_pagebreaks, int number_of_pages) ! %not_overload !%wxchkver_2_8 virtual bool AdjustPagebreak(int pagebreak) // int* known_pagebreaks, int number_of_pages) // %override bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) // C++ Func: bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) ! %not_overload %wxchkver_2_8 virtual bool AdjustPagebreak(int pagebreak, wxArrayInt& known_pagebreaks) //virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info) *************** *** 148,153 **** void SetWidthFloat(const wxHtmlTag& tag, double pixel_scale = 1.0) ! // %wxchkver_2_5 wxHtmlCell* GetFirstChild() see wxHtmlCell ! // !%wxchkver_2_5 wxHtmlCell* GetFirstCell() - nobody probably uses this %endclass --- 148,153 ---- void SetWidthFloat(const wxHtmlTag& tag, double pixel_scale = 1.0) ! // %wxchkver_2_6 wxHtmlCell* GetFirstChild() see wxHtmlCell ! // !%wxchkver_2_6 wxHtmlCell* GetFirstCell() - nobody probably uses this %endclass *************** *** 249,254 **** wxColour GetLinkColor() const //wxFontEncoding GetOutputEncoding() const ! %wxchkver_2_7 wxHtmlWindowInterface *GetWindowInterface() ! !%wxchkver_2_7 wxWindow* GetWindow() wxHtmlContainerCell* OpenContainer() void SetActualColor(const wxColour& clr) --- 249,254 ---- wxColour GetLinkColor() const //wxFontEncoding GetOutputEncoding() const ! %wxchkver_2_8 wxHtmlWindowInterface *GetWindowInterface() ! !%wxchkver_2_8 wxWindow* GetWindow() wxHtmlContainerCell* OpenContainer() void SetActualColor(const wxColour& clr) *************** *** 274,278 **** // wxHtmlWindowInterface ! %if %wxchkver_2_7 %enum wxHtmlWindowInterface::HTMLCursor --- 274,278 ---- // wxHtmlWindowInterface ! %if %wxchkver_2_8 %enum wxHtmlWindowInterface::HTMLCursor *************** *** 323,327 **** %endclass ! %endif //%wxchkver_2_7 // --------------------------------------------------------------------------- --- 323,327 ---- %endclass ! %endif //%wxchkver_2_8 // --------------------------------------------------------------------------- *************** *** 337,342 **** void SetSize(int width, int height) void SetHtmlText(const wxString& html, const wxString& basepath = "", bool isdir = true) ! !%wxchkver_2_7 int Render(int x, int y, int from = 0, int dont_render = false) //, int *known_pagebreaks = NULL, int number_of_pages = 0) ! %wxchkver_2_7 int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0, int dont_render = false, int to = INT_MAX); int GetTotalHeight() %endclass --- 337,342 ---- void SetSize(int width, int height) void SetHtmlText(const wxString& html, const wxString& basepath = "", bool isdir = true) ! !%wxchkver_2_8 int Render(int x, int y, int from = 0, int dont_render = false) //, int *known_pagebreaks = NULL, int number_of_pages = 0) ! %wxchkver_2_8 int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0, int dont_render = false, int to = INT_MAX); int GetTotalHeight() %endclass *************** *** 354,358 **** bool PrintFile(const wxString& htmlfile) bool PrintText(const wxString& htmltext, const wxString& basepath = "") ! %wxchkver_2_4&!%wxchkver_2_5 void PrinterSetup() void PageSetup() //void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = NULL) --- 354,358 ---- bool PrintFile(const wxString& htmlfile) bool PrintText(const wxString& htmltext, const wxString& basepath = "") ! %wxchkver_2_4&!%wxchkver_2_6 void PrinterSetup() void PageSetup() //void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = NULL) Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** datetime.i 17 Jun 2007 18:36:06 -0000 1.31 --- datetime.i 18 Jun 2007 02:56:23 -0000 1.32 *************** *** 18,24 **** %wxcompat_2_6 %function long wxGetElapsedTime(bool resetTimer = true) // deprecated in 2.8 use wxStopWatch %function void wxSleep(int secs) ! %wxchkver_2_5 %function void wxMilliSleep(unsigned long milliseconds) ! %wxchkver_2_5 %function void wxMicroSleep(unsigned long microseconds) ! !%wxchkver_2_5 %function void wxUsleep(unsigned long milliseconds) // --------------------------------------------------------------------------- --- 18,24 ---- %wxcompat_2_6 %function long wxGetElapsedTime(bool resetTimer = true) // deprecated in 2.8 use wxStopWatch %function void wxSleep(int secs) ! %wxchkver_2_6 %function void wxMilliSleep(unsigned long milliseconds) ! %wxchkver_2_6 %function void wxMicroSleep(unsigned long microseconds) ! !%wxchkver_2_6 %function void wxUsleep(unsigned long milliseconds) // --------------------------------------------------------------------------- *************** *** 179,183 **** !%wxchkver_2_6 bool SetToTheWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) !%wxchkver_2_6 wxDateTime GetWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) const ! %wxchkver_2_5 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 --- 179,183 ---- !%wxchkver_2_6 bool SetToTheWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) !%wxchkver_2_6 wxDateTime GetWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) const ! %wxchkver_2_6 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 Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** appframe.i 17 Jun 2007 17:17:36 -0000 1.39 --- appframe.i 18 Jun 2007 02:56:23 -0000 1.40 *************** *** 154,163 **** // wxChar** wxApp::argv ! //!%wxchkver_2_5|%wxcompat_2_4 virtual wxLog* CreateLogTarget() void Dispatch() void ExitMainLoop() // virtual int FilterEvent(wxEvent& event) too dangerous, use ConnectEvent wxString GetAppName() const ! //!%wxchkver_2_5&%win bool GetAuto3D() const wxString GetClassName() const bool GetExitOnFrameDelete() const --- 154,163 ---- // wxChar** wxApp::argv ! //!%wxchkver_2_6|%wxcompat_2_4 virtual wxLog* CreateLogTarget() void Dispatch() void ExitMainLoop() // virtual int FilterEvent(wxEvent& event) too dangerous, use ConnectEvent wxString GetAppName() const ! //!%wxchkver_2_6&%win bool GetAuto3D() const wxString GetClassName() const bool GetExitOnFrameDelete() const *************** *** 174,179 **** // virtual int OnRun() nothing we can do here bool Pending() ! // !%wxchkver_2_5 bool SendIdleEvents() ! %wxchkver_2_5 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event) void SetAppName(const wxString& name) //!%wxchkver_2_4&(%win|%mac) void SetAuto3D(const bool auto3D) --- 174,179 ---- // virtual int OnRun() nothing we can do here bool Pending() ! // !%wxchkver_2_6 bool SendIdleEvents() ! %wxchkver_2_6 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event) void SetAppName(const wxString& name) //!%wxchkver_2_4&(%win|%mac) void SetAuto3D(const bool auto3D) *************** *** 213,221 **** // No constructors, virtual base class, use wxFrame or wxDialog ! %wxchkver_2_7 wxWindow* GetDefaultItem() const wxIcon GetIcon() const //const wxIconBundle& GetIcons() const wxString GetTitle() const ! %wxchkver_2_7 wxWindow* GetTmpDefaultItem() const bool IsActive() const void Iconize(bool iconize) --- 213,221 ---- // No constructors, virtual base class, use wxFrame or wxDialog ! %wxchkver_2_8 wxWindow* GetDefaultItem() const wxIcon GetIcon() const //const wxIconBundle& GetIcons() const wxString GetTitle() const ! %wxchkver_2_8 wxWindow* GetTmpDefaultItem() const bool IsActive() const void Iconize(bool iconize) *************** *** 225,229 **** void Maximize(bool maximize) void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) ! %wxchkver_2_7 wxWindow* SetDefaultItem(wxWindow *win) void SetIcon(const wxIcon& icon) void SetIcons(const wxIconBundle& icons) --- 225,229 ---- void Maximize(bool maximize) void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) ! %wxchkver_2_8 wxWindow* SetDefaultItem(wxWindow *win) void SetIcon(const wxIcon& icon) void SetIcons(const wxIconBundle& icons) *************** *** 232,236 **** bool SetShape(const wxRegion& region) virtual void SetTitle(const wxString& title) ! %wxchkver_2_7 wxWindow* SetTmpDefaultItem(wxWindow *win) %win bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) %endclass --- 232,236 ---- bool SetShape(const wxRegion& region) virtual void SetTitle(const wxString& title) ! %wxchkver_2_8 wxWindow* SetTmpDefaultItem(wxWindow *win) %win bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) %endclass *************** *** 252,256 **** %define wxMAXIMIZE %define wxMAXIMIZE_BOX ! %wxchkver_2_5 %define wxCLOSE_BOX %define wxSTAY_ON_TOP %define wxSYSTEM_MENU --- 252,256 ---- %define wxMAXIMIZE %define wxMAXIMIZE_BOX ! %wxchkver_2_6 %define wxCLOSE_BOX %define wxSTAY_ON_TOP %define wxSYSTEM_MENU *************** *** 262,267 **** %define wxFRAME_FLOAT_ON_PARENT %define wxFRAME_EX_CONTEXTHELP ! %wxchkver_2_5 %define wxFRAME_SHAPED ! %wxchkver_2_5 %define wxFRAME_EX_METAL %define wxTHICK_FRAME --- 262,267 ---- %define wxFRAME_FLOAT_ON_PARENT %define wxFRAME_EX_CONTEXTHELP ! %wxchkver_2_6 %define wxFRAME_SHAPED ! %wxchkver_2_6 %define wxFRAME_EX_METAL %define wxTHICK_FRAME *************** *** 620,621 **** --- 620,747 ---- %endif //wxLUA_USE_wxSystemOptions + + // --------------------------------------------------------------------------- + // wxPlatformInfo + + %enum wxOperatingSystemId + wxOS_UNKNOWN // returned on error + + wxOS_MAC_OS // Apple Mac OS 8/9/X with Mac paths + wxOS_MAC_OSX_DARWIN // Apple Mac OS X with Unix paths + wxOS_MAC // wxOS_MAC_OS|wxOS_MAC_OSX_DARWIN, + + wxOS_WINDOWS_9X // Windows 9x family (95/98/ME) + wxOS_WINDOWS_NT // Windows NT family (NT/2000/XP) + wxOS_WINDOWS_MICRO // MicroWindows + wxOS_WINDOWS_CE // Windows CE (Window Mobile) + wxOS_WINDOWS // wxOS_WINDOWS_9X|wxOS_WINDOWS_NT|wxOS_WINDOWS_MICRO|wxOS_WINDOWS_CE, + + wxOS_UNIX_LINUX // Linux + wxOS_UNIX_FREEBSD // FreeBSD + wxOS_UNIX_OPENBSD // OpenBSD + wxOS_UNIX_NETBSD // NetBSD + wxOS_UNIX_SOLARIS // SunOS + wxOS_UNIX_AIX // AIX + wxOS_UNIX_HPUX // HP/UX + wxOS_UNIX // wxOS_UNIX_LINUX|wxOS_UNIX_FREEBSD|wxOS_UNIX_OPENBSD|wxOS_UNIX_NETBSD|wxOS_UNIX_SOLARIS|wxOS_UNIX_AIX|wxOS_UNIX_HPUX, + + wxOS_DOS // Microsoft DOS + wxOS_OS2 // OS/2 + %endenum + + %enum wxPortId + wxPORT_UNKNOWN // returned on error + + wxPORT_BASE // wxBase, no native toolkit used + + wxPORT_MSW // wxMSW, native toolkit is Windows API + wxPORT_MOTIF // wxMotif, using [Open]Motif or Lesstif + wxPORT_GTK ... [truncated message content] |
