Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets defsutil.i, 1.34, 1.35 gdi.i, 1.41, 1.42 image.i, 1.19, 1.20 override.hpp, 1.62, 1.63 wx_datatypes.lua, 1.54, 1.55
|
From: John L. <jr...@us...> - 2007-03-13 05:01:05
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2508/wxLua/bindings/wxwidgets Modified Files: defsutil.i gdi.i image.i override.hpp wx_datatypes.lua Log Message: update image.i to wxWidgets 2.8 using headers Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** defsutil.i 12 Mar 2007 23:12:31 -0000 1.34 --- defsutil.i 13 Mar 2007 05:01:00 -0000 1.35 *************** *** 488,492 **** %define wxCENTRE_ON_SCREEN %define wxCOLOURED - %define wxDD_NEW_DIR_BUTTON //%define wxED_BUTTONS_BOTTOM // for wxExtDialog? not used? //%define wxED_BUTTONS_RIGHT --- 488,491 ---- Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** wx_datatypes.lua 12 Mar 2007 23:12:31 -0000 1.54 --- wx_datatypes.lua 13 Mar 2007 05:01:01 -0000 1.55 *************** *** 1747,1750 **** --- 1747,1768 ---- Name = "wxImageHandler", }, + wxImageHistogram = { + Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", + DefType = "class", + IsNumber = false, + Name = "wxImageHistogram", + }, + ["wxImageHistogram::iterator"] = { + Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", + DefType = "class", + IsNumber = false, + Name = "wxImageHistogram::iterator", + }, + wxImageHistogramEntry = { + Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", + DefType = "class", + IsNumber = false, + Name = "wxImageHistogramEntry", + }, wxImageList = { BaseClass = "wxObject", Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** gdi.i 12 Mar 2007 23:12:31 -0000 1.41 --- gdi.i 13 Mar 2007 05:01:00 -0000 1.42 *************** *** 1134,1137 **** --- 1134,1138 ---- %define wxIMAGELIST_DRAW_SELECTED %define wxIMAGELIST_DRAW_FOCUSED + %define wxIMAGE_LIST_NORMAL %define wxIMAGE_LIST_SMALL Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** override.hpp 9 Mar 2007 06:10:15 -0000 1.62 --- override.hpp 13 Mar 2007 05:01:00 -0000 1.63 *************** *** 3320,3323 **** --- 3320,3381 ---- %end + %override wxLua_wxImageHistogram_iterator_Get_first + // %member long first + static int LUACALL wxLua_wxImageHistogram_iterator_Get_first(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxImageHistogram::iterator *self = (wxImageHistogram::iterator *) wxlState.GetUserDataType(1, s_wxluatag_wxImageHistogram_iterator); + // push the result number + lua_pushnumber(L, (*self)->first); // *** need to cast self to object from pointer + // return the number of parameters + return 1; + } + %end + + %override wxLua_wxImageHistogram_iterator_Set_first + // %member long first + static int LUACALL wxLua_wxImageHistogram_iterator_Set_first(lua_State *L) + { + wxLuaState wxlState(L); + // get the number value + long val = (long)wxlState.GetNumberType(2); + // get this + wxImageHistogram::iterator *self = (wxImageHistogram::iterator *)wxlState.GetUserDataType(1, s_wxluatag_wxImageHistogram_iterator); + (*self)->first = val; // *** need to cast self to object from pointer + // return the number of parameters + return 0; + } + %end + + %override wxLua_wxImageHistogram_iterator_Get_second + // %member wxImageHistogramEntry second + static int LUACALL wxLua_wxImageHistogram_iterator_Get_second(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxImageHistogram::iterator *self = (wxImageHistogram::iterator *) wxlState.GetUserDataType(1, s_wxluatag_wxImageHistogram_iterator); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxImageHistogramEntry, &(*self)->second); // *** need to cast self to object from pointer + // return the number of parameters + return 1; + } + %end + + %override wxLua_wxImageHistogram_iterator_Set_second + // %member wxImageHistogramEntry second + static int LUACALL wxLua_wxImageHistogram_iterator_Set_second(lua_State *L) + { + wxLuaState wxlState(L); + // get the data type value + wxImageHistogramEntry* val = (wxImageHistogramEntry*)wxlState.GetUserDataType(2, s_wxluatag_wxImageHistogramEntry); + // get this + wxImageHistogram::iterator *self = (wxImageHistogram::iterator *)wxlState.GetUserDataType(1, s_wxluatag_wxImageHistogram_iterator); + (*self)->second = *val; // *** need to cast self to object from pointer + // return the number of parameters + return 0; + } + %end + // ---------------------------------------------------------------------------- // Overrides for mdi.i Index: image.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** image.i 12 Mar 2007 23:12:31 -0000 1.19 --- image.i 13 Mar 2007 05:01:00 -0000 1.20 *************** *** 8,15 **** // ============================================================================ - %enum - wxIMAGE_RESOLUTION_INCHES - wxIMAGE_RESOLUTION_CM - %endenum %define wxIMAGE_ALPHA_TRANSPARENT --- 8,11 ---- *************** *** 70,73 **** --- 66,70 ---- %define %string wxIMAGE_OPTION_QUALITY _T("quality") %define %string wxIMAGE_OPTION_FILENAME _T("FileName") + %define %string wxIMAGE_OPTION_RESOLUTION _T("Resolution") %define %string wxIMAGE_OPTION_RESOLUTIONX _T("ResolutionX") *************** *** 75,78 **** --- 72,84 ---- %define %string wxIMAGE_OPTION_RESOLUTIONUNIT _T("ResolutionUnit") + %enum + // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT + wxIMAGE_RESOLUTION_INCHES + wxIMAGE_RESOLUTION_CM + + // Constants for wxImage::Scale() for determining the level of quality + wxIMAGE_QUALITY_NORMAL + wxIMAGE_QUALITY_HIGH + %endenum %class %delete wxImage, wxObject *************** *** 87,93 **** static void AddHandler(wxImageHandler* handler) static void CleanUpHandlers() ! //unsigned long ComputeHistogram(wxImageHistogram& histogram) const ! //wxBitmap ConvertToBitmap() const - deprecated wxImage ConvertToMono(unsigned char r, unsigned char g, unsigned char b) const wxImage Copy() const --- 93,103 ---- static void AddHandler(wxImageHandler* handler) + %wxchkver_2_8 wxImage Blur(int radius) + %wxchkver_2_8 wxImage BlurHorizontal(int radius) + %wxchkver_2_8 wxImage BlurVertical(int radius) static void CleanUpHandlers() ! unsigned long ComputeHistogram(wxImageHistogram& histogram) const ! //wxBitmap ConvertToBitmap() const - deprecated use wxBitmap constructor ! %wxchkver_2_8 wxImage ConvertToGreyscale( double lr = 0.299, double lg = 0.587, double lb = 0.114 ) const wxImage ConvertToMono(unsigned char r, unsigned char g, unsigned char b) const wxImage Copy() const *************** *** 118,122 **** wxImage GetSubImage(const wxRect& rect) const int GetWidth() const ! // note: we're tricking generator to not gag on RGB/HSVValue // %override [r, g, b] HSVtoRGB(double h, double s, double v) // static RGBValue HSVtoRGB(const HSVValue& hsv) --- 128,132 ---- wxImage GetSubImage(const wxRect& rect) const int GetWidth() const ! // note: we're tricking generator to not gag on RGB/HSVValue, so pretend to return an int // %override [r, g, b] HSVtoRGB(double h, double s, double v) // static RGBValue HSVtoRGB(const HSVValue& hsv) *************** *** 141,145 **** wxImage Mirror(bool horizontally = true) const void Replace(unsigned char r1, unsigned char g1, unsigned char b1, unsigned char r2, unsigned char g2, unsigned char b2) ! wxImage& Rescale(int width, int height) wxImage& Resize(const wxSize& size, const wxPoint& pos, int red = -1, int green = -1, int blue = -1) wxImage Rotate(double angle, const wxPoint& rotationCentre, bool interpolating = true, wxPoint* offsetAfterRotation = NULL) --- 151,158 ---- wxImage Mirror(bool horizontally = true) const void Replace(unsigned char r1, unsigned char g1, unsigned char b1, unsigned char r2, unsigned char g2, unsigned char b2) ! %wxchkver_2_8 wxImage ResampleBox(int width, int height) const ! %wxchkver_2_8 wxImage ResampleBicubic(int width, int height) const ! !%wxchkver_2_8 wxImage& Rescale(int width, int height) ! %wxchkver_2_8 wxImage& Rescale( int width, int height, int quality = wxIMAGE_QUALITY_NORMAL ) wxImage& Resize(const wxSize& size, const wxPoint& pos, int red = -1, int green = -1, int blue = -1) wxImage Rotate(double angle, const wxPoint& rotationCentre, bool interpolating = true, wxPoint* offsetAfterRotation = NULL) *************** *** 149,153 **** %rename SaveFileType bool SaveFile(const wxString& name, int type %rename SaveMimeFile bool SaveFile(const wxString& name, const wxString& mimetype) ! wxImage Scale(int width, int height) const wxImage Size(const wxSize& size, const wxPoint& pos, int red = -1, int green = -1, int blue = -1) const void SetAlpha(int x, int y, unsigned char alpha) --- 162,167 ---- %rename SaveFileType bool SaveFile(const wxString& name, int type %rename SaveMimeFile bool SaveFile(const wxString& name, const wxString& mimetype) ! !%wxchkver_2_8 wxImage Scale(int width, int height) const ! %wxchkver_2_8 wxImage Scale( int width, int height, int quality = wxIMAGE_QUALITY_NORMAL ) const wxImage Size(const wxSize& size, const wxPoint& pos, int red = -1, int green = -1, int blue = -1) const void SetAlpha(int x, int y, unsigned char alpha) *************** *** 170,173 **** --- 184,228 ---- //----------------------------------------------------------------------------- + // wxImageHistogram + + %class %noclassinfo %encapsulate wxImageHistogramEntry + wxImageHistogramEntry() + %rename Index %member unsigned long index // GetIndex() and SetIndex(idx) + %rename Value %member unsigned long value // GetValue() and SetValue(val) + %endclass + + %class %noclassinfo %encapsulate wxImageHistogram::iterator + %member long first + %member wxImageHistogramEntry second + + // operator used to compare with wxImageHistogram::end() iterator + %operator bool operator==(const wxImageHistogram::iterator& other) const + %operator wxImageHistogram::iterator& operator++() + %endclass + + %class %noclassinfo %encapsulate wxImageHistogram // wxImageHistogramBase actually a hash map + wxImageHistogram() + + // get the key in the histogram for the given RGB values + static unsigned long MakeKey(unsigned char r, unsigned char g, unsigned char b) + + // Use the function wxImage::FindFirstUnusedColour + //bool FindFirstUnusedColour(unsigned char *r, unsigned char *g, unsigned char *b, unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0 ) const + + // Selected functions from the base wxHashMap class + const wxImageHistogram::iterator begin() const + void clear() + size_t count(long key) const + bool empty() const + const wxImageHistogram::iterator end() const + size_t erase(long key) + wxImageHistogram::iterator find(long key) + //Insert_Result insert(const value_type& v) + size_t size() const + //mapped_type& operator[](const key_type& key) + + %endclass + + //----------------------------------------------------------------------------- // wxImageHandler and derived classes *************** *** 290,293 **** --- 345,351 ---- %if wxUSE_LIBPNG + %define %string wxIMAGE_OPTION_PNG_FORMAT // wxT("PngFormat") + %define %string wxIMAGE_OPTION_PNG_BITDEPTH // wxT("PngBitDepth") + %enum wxPNG_TYPE_COLOUR |
