Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets clipdrag.i, 1.21, 1.22 config.i, 1.14, 1.15 controls.i, 1.27, 1.28 datetime.i, 1.21, 1.22 defsutil.i, 1.31, 1.32 dialogs.i, 1.22, 1.23 file.i, 1.14, 1.15 gdi.i, 1.38, 1.39 override.hpp, 1.60, 1.61 print.i, 1.12, 1.13 wave.i, 1.13, 1.14 windows.i, 1.27, 1.28 wx_datatypes.lua, 1.49, 1.50
|
From: John L. <jr...@us...> - 2007-03-02 05:45:00
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18504/wxLua/bindings/wxwidgets Modified Files: clipdrag.i config.i controls.i datetime.i defsutil.i dialogs.i file.i gdi.i override.hpp print.i wave.i windows.i wx_datatypes.lua Log Message: update more bindings to 2.8 using header files Index: config.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/config.i,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** config.i 23 Feb 2007 04:35:30 -0000 1.14 --- config.i 2 Mar 2007 05:44:21 -0000 1.15 *************** *** 125,127 **** --- 125,141 ---- %endclass + //----------------------------------------------------------------------------- + // wxConfigPathChanger - Skip this for wxLua, just restore the path manually + + // a handy little class which changes current path to the path of given entry + // and restores it in dtor: so if you declare a local variable of this type, + // you work in the entry directory and the path is automatically restored + // when the function returns + + //%class %noclassinfo wxConfigPathChanger + // wxConfigPathChanger(const wxConfigBase *pContainer, const wxString& strEntry) + // wxString Name() const + // %wxchkver_2_8 void UpdateIfDeleted() + //%endclass + %endif //wxLUA_USE_wxConfig & wxUSE_CONFIG Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wave.i 23 Feb 2007 04:35:30 -0000 1.13 --- wave.i 2 Mar 2007 05:44:22 -0000 1.14 *************** *** 151,155 **** int GetNumberAxes() const int GetNumberButtons() const ! %static int GetNumberJoysticks() const int GetPollingMax() const int GetPollingMin() const --- 151,156 ---- int GetNumberAxes() const int GetNumberButtons() const ! %wxchkver_2_8 %static int GetNumberJoysticks() const ! !%wxchkver_2_8 int GetNumberJoysticks() const int GetPollingMax() const int GetPollingMin() const Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** wx_datatypes.lua 23 Feb 2007 04:35:30 -0000 1.49 --- wx_datatypes.lua 2 Mar 2007 05:44:22 -0000 1.50 *************** *** 267,270 **** --- 267,277 ---- Name = "wxArtProvider", }, + wxAutoBufferedPaintDC = { + BaseClass = "wxDC", + Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)", + DefType = "class", + IsNumber = false, + Name = "wxAutoBufferedPaintDC", + }, wxBMPHandler = { BaseClass = "wxImageHandler", *************** *** 667,670 **** --- 674,683 ---- Name = "wxDataFormatId", }, + wxDataInputStream = { + Condition = "wxUSE_STREAMS", + DefType = "class", + IsNumber = false, + Name = "wxDataInputStream", + }, wxDataObject = { Condition = "wxLUA_USE_wxDataObject && wxUSE_DATAOBJ", *************** *** 693,696 **** --- 706,715 ---- Name = "wxDataObjectSimple", }, + wxDataOutputStream = { + Condition = "wxUSE_STREAMS", + DefType = "class", + IsNumber = false, + Name = "wxDataOutputStream", + }, wxDateEvent = { BaseClass = "wxCommandEvent", *************** *** 1752,1755 **** --- 1771,1780 ---- Name = "wxLayoutConstraints", }, + wxLayoutDirection = { + Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC)", + DefType = "enum", + IsNumber = true, + Name = "wxLayoutDirection", + }, wxLayoutOrientation = { Condition = "wxLUA_USE_wxSashWindow && wxUSE_SASH", Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** print.i 23 Feb 2007 04:35:30 -0000 1.12 --- print.i 2 Mar 2007 05:44:22 -0000 1.13 *************** *** 254,257 **** --- 254,258 ---- bool GetColour() const wxDuplexMode GetDuplex() const + %wxchkver_2_8 int GetMedia() const wxPaperSize GetPaperId() const wxSize GetPaperSize() const *************** *** 259,262 **** --- 260,264 ---- wxPrintBin GetBin() const wxPrintMode GetPrintMode() const + %wxchkver_2_8 bool IsOrientationReversed() const void SetNoCopies(int v) void SetCollate(bool flag) *************** *** 265,268 **** --- 267,272 ---- void SetColour(bool colour) void SetDuplex(wxDuplexMode duplex) + %wxchkver_2_8 void SetOrientationReversed(bool reversed) + %wxchkver_2_8 void SetMedia(int media) void SetPaperId(wxPaperSize sizeId) void SetPaperSize(const wxSize& sz) Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** file.i 23 Feb 2007 04:35:30 -0000 1.14 --- file.i 2 Mar 2007 05:44:22 -0000 1.15 *************** *** 386,388 **** --- 386,483 ---- %endclass + //----------------------------------------------------------------------------- + // wxDataInputStream + + %include "wx/datstrm.h" + + %class %noclassinfo wxDataInputStream + //%if wxUSE_UNICODE + // wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto()); + //%endif // wxUSE_UNICODE + //%if !wxUSE_UNICODE + wxDataInputStream(wxInputStream& s) + //%endif // !wxUSE_UNICODE + + bool IsOk() + + //#if wxHAS_INT64 + // wxUint64 Read64() + //#endif + //#if wxUSE_LONGLONG + // wxLongLong ReadLL() + //#endif + wxUint32 Read32() + wxUint16 Read16() + wxUint8 Read8() + double ReadDouble() + wxString ReadString() + + //#if wxHAS_INT64 + // void Read64(wxUint64 *buffer, size_t size) + // void Read64(wxInt64 *buffer, size_t size) + //#endif + //#if defined(wxLongLong_t) && wxUSE_LONGLONG + // void Read64(wxULongLong *buffer, size_t size) + // void Read64(wxLongLong *buffer, size_t size) + //#endif + //#if wxUSE_LONGLONG + // void ReadLL(wxULongLong *buffer, size_t size) + // void ReadLL(wxLongLong *buffer, size_t size) + //#endif + //void Read32(wxUint32 *buffer, size_t size) + //void Read16(wxUint16 *buffer, size_t size) + //void Read8(wxUint8 *buffer, size_t size) + //void ReadDouble(double *buffer, size_t size) + + void BigEndianOrdered(bool be_order) + %endclass + + //----------------------------------------------------------------------------- + // wxDataOutputStream + + %include "wx/datstrm.h" + + %class %noclassinfo wxDataOutputStream + //#if wxUSE_UNICODE + // wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto()); + //#else + wxDataOutputStream(wxOutputStream& s); + //#endif + + bool IsOk() + + //#if wxHAS_INT64 + // void Write64(wxUint64 i); + // void Write64(wxInt64 i); + //#endif + //#if wxUSE_LONGLONG + // void WriteLL(const wxLongLong &ll); + // void WriteLL(const wxULongLong &ll); + //#endif + void Write32(wxUint32 i) + void Write16(wxUint16 i) + void Write8(wxUint8 i) + void WriteDouble(double d) + void WriteString(const wxString& string) + + //#if wxHAS_INT64 + // void Write64(const wxUint64 *buffer, size_t size); + // void Write64(const wxInt64 *buffer, size_t size); + //#endif + //#if defined(wxLongLong_t) && wxUSE_LONGLONG + // void Write64(const wxULongLong *buffer, size_t size); + // void Write64(const wxLongLong *buffer, size_t size); + //#endif + //#if wxUSE_LONGLONG + // void WriteLL(const wxULongLong *buffer, size_t size); + // void WriteLL(const wxLongLong *buffer, size_t size); + //#endif + //void Write32(const wxUint32 *buffer, size_t size); + //void Write16(const wxUint16 *buffer, size_t size); + //void Write8(const wxUint8 *buffer, size_t size); + //void WriteDouble(const double *buffer, size_t size); + + void BigEndianOrdered(bool be_order) + %endclass + %endif // wxUSE_STREAMS Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** windows.i 1 Mar 2007 23:12:31 -0000 1.27 --- windows.i 2 Mar 2007 05:44:22 -0000 1.28 *************** *** 343,346 **** --- 343,349 ---- !%wxchkver26 void SetLabel(const wxString& label) // see wxWindow + //static wxString GetLabelText(const wxString& label) translates arbitrary string, removes mnemonic characters ('&') + %wxchkver_2_8 wxString GetLabelText() const + !%wxchkver26 %property=Label, read, write %endclass *************** *** 408,415 **** //virtual int HitTest(const wxPoint& pt, long* flags = NULL) const //virtual bool HasMultiplePages() const - FIXME do we need this? - %endif // %wxchkver_2_8 - - wxSizer* GetControlSizer() const { return m_controlSizer; } %property=ImageList, read, write --- 411,417 ---- //virtual int HitTest(const wxPoint& pt, long* flags = NULL) const //virtual bool HasMultiplePages() const - FIXME do we need this? + wxSizer* GetControlSizer() const + %endif // %wxchkver_2_8 %property=ImageList, read, write *************** *** 985,988 **** --- 987,992 ---- %define wxST_NO_AUTORESIZE + %wxchkver_2_8 %define wxST_DOTS_MIDDLE + %wxchkver_2_8 %define wxST_DOTS_END %class wxStaticText, wxControl Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** gdi.i 1 Mar 2007 23:12:31 -0000 1.38 --- gdi.i 2 Mar 2007 05:44:22 -0000 1.39 *************** *** 445,448 **** --- 445,457 ---- %include "wx/gdicmn.h" + %if %wxchkver_2_8 + %define wxC2S_NAME // return colour name, when possible + %define wxC2S_CSS_SYNTAX // return colour in rgb(r,g,b) syntax + %define wxC2S_HTML_SYNTAX // return colour in #rrggbb syntax + + %define wxALPHA_TRANSPARENT + %define wxALPHA_OPAQUE + %endif // %wxchkver_2_8 + %class %delete wxColour, wxGDIObject %define %object wxNullColour *************** *** 455,468 **** %rename wxLIGHT_GREY %define %pointer wxLua_wxLIGHT_GREY ! wxColour(const unsigned char red, const unsigned char green, const unsigned char blue) %constructor wxNamedColour(const wxString& colourName) // wxPython compatibility %constructor wxColourCopy(const wxColour& colour) unsigned char Blue() const !%mac long GetPixel() const unsigned char Green() const bool Ok() const unsigned char Red() const ! void Set(const unsigned char red, const unsigned char green, const unsigned char blue) %endclass --- 464,483 ---- %rename wxLIGHT_GREY %define %pointer wxLua_wxLIGHT_GREY ! !%wxchkver_2_8 wxColour(unsigned char red, unsigned char green, unsigned char blue) ! %wxchkver_2_8 wxColour(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha) %constructor wxNamedColour(const wxString& colourName) // wxPython compatibility %constructor wxColourCopy(const wxColour& colour) + %wxchkver_2_8 unsigned char Alpha() const unsigned char Blue() const + %wxchkver_2_8 virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const !%mac long GetPixel() const unsigned char Green() const bool Ok() const unsigned char Red() const ! !%wxchkver_2_8 void Set(unsigned char red, unsigned char green, unsigned char blue) ! %wxchkver_2_8 void Set(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha = wxALPHA_OPAQUE) ! %wxchkver_2_8 %rename SetFromString bool Set(const wxString &str) ! %wxchkver_2_8 %rename SetFromLong void Set(unsigned long colRGB) %endclass *************** *** 975,978 **** --- 990,1002 ---- %define wxWINDING_RULE + %if %wxchkver_2_8 + %enum wxLayoutDirection + wxLayout_Default + wxLayout_LeftToRight + wxLayout_RightToLeft + %endenum + %endif %wxchkver_2_8 + + %class %delete wxDC, wxObject // %win wxDC() wxDC is abstract use wxXXXDC *************** *** 1021,1024 **** --- 1045,1056 ---- void EndPage() void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE) + + %if %wxchkver_2_8 + //void GradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour) + void GradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter) + void GradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST) + wxBitmap GetAsBitmap(const wxRect *subrect = NULL) const + %endif //%wxchkver_2_8 + // alias const wxBrush& GetBackground() *************** *** 1029,1032 **** --- 1061,1065 ---- void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) const wxFont& GetFont() + %wxchkver_2_8 wxLayoutDirection GetLayoutDirection() const int GetLogicalFunction() int GetMapMode() *************** *** 1038,1042 **** --- 1071,1082 ---- //void GetSizeMM(wxCoord *width, wxCoord *height) const // wxSize GetSizeMM() const const wxColour& GetTextBackground() const + // %override [int x, int y, int descent, int externalLeading] int wxDC::GetTextExtent(const wxString& string, const wxFont* font = NULL ) + // void GetTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* descent = NULL, wxCoord* externalLeading = NULL, const wxFont* font = NULL) void GetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) + %wxchkver_2_8 %rename GetTextExtentSize wxSize GetTextExtent(const wxString& string) const + // %override [int x, int y, int heightLine] int wxDC::GetMultiLineTextExtent(const wxString& string, const wxFont* font = NULL ) + // void GetMultiLineTextExtent(const wxString& string, wxCoord* x, wxCoord* y, wxCoord* heightLine = NULL, const wxFont* font = NULL) + %wxchkver_2_8 void GetMultiLineTextExtent(const wxString& string, wxCoord *width, wxCoord *height, wxCoord *heightLine = NULL, wxFont *font = NULL) const + %wxchkver_2_8 %rename GetMultiLineTextExtentSize wxSize GetMultiLineTextExtent(const wxString& string) const const wxColour& GetTextForeground() void GetUserScale(double *x, double *y) *************** *** 1061,1064 **** --- 1101,1105 ---- void SetDeviceOrigin(wxCoord x, wxCoord y) void SetFont(const wxFont& font) + %wxchkver_2_8 void SetLayoutDirection(wxLayoutDirection dir) void SetLogicalFunction(int function) void SetMapMode(int unit) *************** *** 1156,1159 **** --- 1197,1215 ---- //----------------------------------------------------------------------------- + // wxAutoBufferedPaintDC + + %include "wx/dcbuffer.h" + + %if %wxchkver_2_8 + + %define wxALWAYS_NATIVE_DOUBLE_BUFFER + + %class %delete wxAutoBufferedPaintDC, wxDC // ok to derive from wxDC only + %overload wxAutoBufferedPaintDC(wxWindow *window) + %endclass + + %endif // %wxchkver_2_8 + + //----------------------------------------------------------------------------- // wxMirrorDC *************** *** 1333,1337 **** // int GetDepth() const // in docs BUT not in C++ header %static int GetFromPoint(const wxPoint& pt) ! %static int GetFromWindow(wxWindow* win) wxRect GetGeometry() const %wxchkver_2_8 wxRect GetClientArea() const --- 1389,1393 ---- // int GetDepth() const // in docs BUT not in C++ header %static int GetFromPoint(const wxPoint& pt) ! %wxchkver_2_8|!%gtk %static int GetFromWindow(wxWindow* win) wxRect GetGeometry() const %wxchkver_2_8 wxRect GetClientArea() const Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** override.hpp 22 Feb 2007 05:40:52 -0000 1.60 --- override.hpp 2 Mar 2007 05:44:22 -0000 1.61 *************** *** 2646,2649 **** --- 2646,2676 ---- %end + %override wxLua_wxDC_GetMultiLineTextExtent + // void GetMultiLineTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *heightLine = NULL, wxFont *font = NULL) + static int LUACALL wxLua_wxDC_GetMultiLineTextExtent(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // wxFont *font = NULL + wxFont *font = (argCount >= 3 ? (wxFont *)wxlState.GetUserDataType(3, s_wxluatag_wxFont) : NULL); + + wxCoord heightLine; + wxCoord h; + wxCoord w; + + wxString string = wxlState.GetwxStringType(2); + // get this + wxDC *self = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC); + // call GetTextExtent + self->GetMultiLineTextExtent(string, &w, &h, &heightLine, font); + lua_pushnumber(L, w); + lua_pushnumber(L, h); + lua_pushnumber(L, heightLine); + // return the number of parameters + return 4; + } + %end + %override wxLua_wxDC_GetClippingBox // void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** datetime.i 18 Jan 2007 17:19:01 -0000 1.21 --- datetime.i 2 Mar 2007 05:44:21 -0000 1.22 *************** *** 56,59 **** --- 56,60 ---- GMT11 GMT12 + %wxchkver_2_8 GMT13 WET WEST *************** *** 81,84 **** --- 82,87 ---- A_EST A_ESST + %wxchkver_2_8 NZST + %wxchkver_2_8 NZDT UTC %endenum Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** clipdrag.i 23 Feb 2007 04:35:30 -0000 1.21 --- clipdrag.i 2 Mar 2007 05:44:21 -0000 1.22 *************** *** 141,144 **** --- 141,145 ---- void Add(wxDataObjectSimple *dataObject, bool preferred = false) + %wxchkver_2_8 wxDataFormat GetReceivedFormat() const %endclass Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** dialogs.i 23 Feb 2007 04:35:30 -0000 1.22 --- dialogs.i 2 Mar 2007 05:44:22 -0000 1.23 *************** *** 39,43 **** %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1) %function void wxEndBusyCursor() ! wxUSE_COLOURDLG %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit) // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) --- 39,44 ---- %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1) %function void wxEndBusyCursor() ! wxUSE_COLOURDLG&&!%wxchkver_2_8 %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) ! wxUSE_COLOURDLG&&%wxchkver_2_8 %function wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wxString& caption = "") wxUSE_FONTDLG %function wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit) // %override [int, lua int table] wxGetMultipleChoices(const wxString& message, const wxString& caption, lua string table, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** controls.i 1 Mar 2007 23:12:31 -0000 1.27 --- controls.i 2 Mar 2007 05:44:21 -0000 1.28 *************** *** 8,11 **** --- 8,13 ---- // ============================================================================ + // FIXME - handle WX_DECLARE_CONTROL_CONTAINER ? + //----------------------------------------------------------------------------- // wxButton Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** defsutil.i 23 Feb 2007 04:35:30 -0000 1.31 --- defsutil.i 2 Mar 2007 05:44:22 -0000 1.32 *************** *** 368,374 **** --- 368,377 ---- %define wxID_PRINT %define wxID_PRINT_SETUP + %wxchkver_2_8 %define wxID_PAGE_SETUP %define wxID_PREVIEW %define wxID_ABOUT %define wxID_HELP_CONTENTS + %wxchkver_2_8 %define wxID_HELP_INDEX + %wxchkver_2_8 %define wxID_HELP_SEARCH %define wxID_HELP_COMMANDS %define wxID_HELP_PROCEDURES *************** *** 377,380 **** --- 380,384 ---- %define wxID_PREFERENCES + %wxchkver_2_8 %define wxID_EDIT %define wxID_CUT %define wxID_COPY *************** *** 398,401 **** --- 402,406 ---- %define wxID_VIEW_SORTTYPE + %wxchkver_2_8 %define wxID_FILE %define wxID_FILE1 %define wxID_FILE2 *************** *** 479,482 **** --- 484,488 ---- %define wxCENTRE_ON_SCREEN %define wxCOLOURED + %define wxDD_NEW_DIR_BUTTON //%define wxED_BUTTONS_BOTTOM // for wxExtDialog? not used? //%define wxED_BUTTONS_RIGHT *************** *** 508,512 **** %define wxSIZE_NO_ADJUSTMENTS %define wxSIZE_USE_EXISTING - %define wxST_NO_AUTORESIZE %define wxTOP %define wxUNKNOWN_PLATFORM --- 514,517 ---- *************** *** 584,589 **** --- 589,598 ---- wxMOD_ALT wxMOD_CONTROL + %wxchkver_2_8 wxMOD_ALTGR wxMOD_SHIFT + %wxchkver_2_8 wxMOD_META wxMOD_WIN + %wxchkver_2_8 wxMOD_CMD + %wxchkver_2_8 wxMOD_ALL %endenum %endif |
