[Wxlua-commit] wxLua/bindings/wxwidgets datetime.i, 1.17, 1.18 gdi.i, 1.27, 1.28 image.i, 1.13, 1.14 windows.i, 1.21, 1.22 wx_datatypes.lua, 1.37, 1.38

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/bindings/wxwidgets

Modified Files:
	datetime.i gdi.i image.i windows.i wx_datatypes.lua 
Log Message:
Added wxDisplay and friends
Added more wxDateTimeXXX classes
update to compile in wxWidgets 2.7.2


Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** windows.i	23 Aug 2006 04:57:52 -0000	1.21
--- windows.i	2 Nov 2006 23:38:08 -0000	1.22
***************
*** 110,114 ****
      wxAcceleratorTable* GetAcceleratorTable() const
      //wxAccessible* GetAccessible()
!     wxSize GetAdjustedBestSize() const
      virtual wxColour GetBackgroundColour() const
      virtual wxBackgroundStyle GetBackgroundStyle() const
--- 110,114 ----
      wxAcceleratorTable* GetAcceleratorTable() const
      //wxAccessible* GetAccessible()
!     !%wxchkver27 wxSize GetAdjustedBestSize() const
      virtual wxColour GetBackgroundColour() const
      virtual wxBackgroundStyle GetBackgroundStyle() const

Index: datetime.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** datetime.i	1 Nov 2006 23:44:46 -0000	1.17
--- datetime.i	2 Nov 2006 23:38:08 -0000	1.18
***************
*** 205,208 ****
--- 205,228 ----
  %endclass
  
+ //-----------------------------------------------------------------------------
+ // wxDateTimeArray
+ 
+ %class %delete %noclassinfo %encapsulate wxDateTimeArray
+     %overload wxDateTimeArray()
+     %overload %constructor wxDateTimeArrayCopy(const wxDateTimeArray& array)
+ 
+     void Add(const wxDateTime& dateTime, size_t copies = 1)
+     void Alloc(size_t nCount)
+     void Clear()
+     void Empty()
+     int GetCount() const
+     void Insert(const wxDateTime& dt, int nIndex, size_t copies = 1)
+     bool IsEmpty()
+     wxDateTime Item(size_t nIndex) const
+     wxDateTime Last()
+     void RemoveAt(size_t nIndex, size_t count = 1)
+     void Shrink()
+ %endclass
+ 
  %endif wxLUA_USE_wxDateTime
  
***************
*** 302,305 ****
--- 322,349 ----
  
  //-----------------------------------------------------------------------------
+ // wxDateTimeHolidayAuthority
+ 
+ %if wxLUA_USE_wxDateTimeHolidayAuthority
+ 
+ %class %noclassinfo %encapsulate wxDateTimeHolidayAuthority
+     // no constructor since this class has pure virtual functions
+ 
+     %static bool IsHoliday(const wxDateTime& dt)
+     %static size_t GetHolidaysInRange(const wxDateTime& dtStart, const wxDateTime& dtEnd, wxDateTimeArray& holidays)
+     %static void ClearAllAuthorities()
+     %static void AddAuthority(wxDateTimeHolidayAuthority *auth)
+ 
+ %endclass
+ 
+ //-----------------------------------------------------------------------------
+ // wxDateTimeWorkDays
+ 
+ %class %noclassinfo %encapsulate wxDateTimeWorkDays, wxDateTimeHolidayAuthority
+     wxDateTimeWorkDays()
+ %endclass
+ 
+ %endif wxLUA_USE_wxDateTimeHolidayAuthority
+ 
+ //-----------------------------------------------------------------------------
  // wxTimer
  

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** wx_datatypes.lua	1 Nov 2006 23:44:46 -0000	1.37
--- wx_datatypes.lua	2 Nov 2006 23:38:08 -0000	1.38
***************
*** 229,232 ****
--- 229,238 ----
      Name = "wxArrayTreeItemIds",
    },
+   wxArrayVideoModes = {
+     Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxArrayVideoModes",
+   },
    wxArtProvider = {
      BaseClass = "wxObject",
***************
*** 619,622 ****
--- 625,634 ----
      Name = "wxDC",
    },
+   wxDCClipper = {
+     Condition = "wxLUA_USE_wxDC",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxDCClipper",
+   },
    wxDataFormat = {
      Condition = "wxLUA_USE_wxDataObject",
***************
*** 713,716 ****
--- 725,747 ----
      Name = "wxDateTime::WeekDay",
    },
+   wxDateTimeArray = {
+     Condition = "wxLUA_USE_wxDateTime",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxDateTimeArray",
+   },
+   wxDateTimeHolidayAuthority = {
+     Condition = "wxLUA_USE_wxDateTimeHolidayAuthority",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxDateTimeHolidayAuthority",
+   },
+   wxDateTimeWorkDays = {
+     BaseClass = "wxDateTimeHolidayAuthority",
+     Condition = "wxLUA_USE_wxDateTimeHolidayAuthority",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxDateTimeWorkDays",
+   },
    wxDialog = {
      BaseClass = "wxTopLevelWindow",
***************
*** 738,741 ****
--- 769,778 ----
      Name = "wxDirection",
    },
+   wxDisplay = {
+     Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxDisplay",
+   },
    wxDocChildFrame = {
      BaseClass = "wxFrame",
***************
*** 3027,3030 ****
--- 3064,3073 ----
      Name = "wxValidator",
    },
+   wxVideoMode = {
+     Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY",
+     DefType = "class",
+     Intrinsic = false,
+     Name = "wxVideoMode",
+   },
    wxView = {
      BaseClass = "wxEvtHandler",

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** gdi.i	11 Oct 2006 03:24:01 -0000	1.27
--- gdi.i	2 Nov 2006 23:38:08 -0000	1.28
***************
*** 75,78 ****
--- 75,81 ----
      %overload %constructor wxRectFromSize(const wxSize& size)
  
+     %wxchkver27 %overload bool Contains(wxCoord dx, wxCoord dy) const
+     %wxchkver27 %overload %rename ContainsPoint bool Contains(const wxPoint& pt) const
+     %wxchkver27 %overload %rename ContainsRect bool Contains(const wxRect& rect) const
      wxRect  Deflate(wxCoord dx, wxCoord dy) const //wxRect& Deflate(wxCoord dx, wxCoord dy)
      int     GetBottom()
***************
*** 89,93 ****
      int     GetY()
      wxRect  Inflate(wxCoord dx, wxCoord dy) const //wxRect& Inflate(wxCoord dx, wxCoord dy)
!     bool    Inside(wxCoord cx, wxCoord cy)
      bool    Intersects(const wxRect& rect) const
      bool    IsEmpty() const
--- 92,96 ----
      int     GetY()
      wxRect  Inflate(wxCoord dx, wxCoord dy) const //wxRect& Inflate(wxCoord dx, wxCoord dy)
!     !%wxchkver27 bool    Inside(wxCoord cx, wxCoord cy)
      bool    Intersects(const wxRect& rect) const
      bool    IsEmpty() const
***************
*** 955,959 ****
      // %win wxDC() wxDC is abstract use wxXXXDC
  
!     void BeginDrawing()
      bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = false)
      void CalcBoundingBox(wxCoord x, wxCoord y)
--- 958,962 ----
      // %win wxDC() wxDC is abstract use wxXXXDC
  
!     //void BeginDrawing() // these are deprecated in 2.8 and didn't do anything anyway
      bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = false)
      void CalcBoundingBox(wxCoord x, wxCoord y)
***************
*** 993,997 ****
      void DrawText(const wxString& text, wxCoord x, wxCoord y)
      void EndDoc()
!     void EndDrawing()
      void EndPage()
      void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE)
--- 996,1000 ----
      void DrawText(const wxString& text, wxCoord x, wxCoord y)
      void EndDoc()
!     //void EndDrawing()  // these are deprecated in 2.8 and didn't do anything anyway
      void EndPage()
      void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE)
***************
*** 1063,1067 ****
  %class %delete wxMemoryDC, wxDC
      wxMemoryDC()
!     void SelectObject(const wxBitmap& bitmap)
  %endclass
  
--- 1066,1070 ----
  %class %delete wxMemoryDC, wxDC
      wxMemoryDC()
!     void SelectObject(wxBitmap& bitmap) // not const in >=2.8
  %endclass
  
***************
*** 1114,1121 ****
      %overload wxBufferedDC()
      %overload %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA)
!     %overload %constructor wxBufferedDCFromBitmap(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA)
  
      %overload void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA)
!     %overload %rename InitFromBitmap void Init(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA)
  %endclass
  
--- 1117,1124 ----
      %overload wxBufferedDC()
      %overload %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA)
!     %overload %constructor wxBufferedDCFromBitmap(wxDC *dc, wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) // not const bitmap >= 2.8
  
      %overload void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA)
!     %overload %rename InitFromBitmap void Init(wxDC *dc, wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) // not const bitmap in >= 2.8
  %endclass
  
***************
*** 1127,1131 ****
  %class %delete wxBufferedPaintDC, wxBufferedDC
      %overload wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA)
!     %overload %constructor wxBufferedPaintDCFromBitmap(wxWindow *window, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA)
  %endclass
  
--- 1130,1134 ----
  %class %delete wxBufferedPaintDC, wxBufferedDC
      %overload wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA)
!     %overload %constructor wxBufferedPaintDCFromBitmap(wxWindow *window, wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) // not const bitmap in >= 2.8
  %endclass
  
***************
*** 1139,1142 ****
--- 1142,1156 ----
  %endclass
  
+ //-----------------------------------------------------------------------------
+ // wxDCClipper
+ 
+ %include "wx/dc.h"
+ 
+ %class %delete %noclassinfo %encapsulate wxDCClipper
+     %overload wxDCClipper(wxDC& dc, const wxRegion& r)
+     %overload %constructor wxDCClipperFromRect(wxDC& dc, const wxRect& r)
+     //%overload %constructor wxDCClipperFromCoords(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+ %endclass
+ 
  %endif wxLUA_USE_wxDC
  
***************
*** 1233,1234 ****
--- 1247,1312 ----
  
  %endif wxLUA_USE_wxGLCanvas & wxUSE_GLCANVAS
+ 
+ //-----------------------------------------------------------------------------
+ // wxVideoMode
+ 
+ %if wxLUA_USE_wxDisplay & wxUSE_DISPLAY
+ 
+ %include "wx/display.h"
+ 
+ %class %noclassinfo %encapsulate wxVideoMode
+     %define %object wxDefaultVideoMode
+ 
+     wxVideoMode(int width = 0, int height = 0, int depth = 0, int freq = 0)
+ 
+     bool Matches(const wxVideoMode& other) const
+     int GetWidth() const
+     int GetHeight() const
+     int GetDepth() const
+     bool IsOk() const
+ 
+     %operator bool operator==(const wxVideoMode& v) const
+ %endclass
+ 
+ //-----------------------------------------------------------------------------
+ // wxArrayVideoModes
+ 
+ %class %delete %noclassinfo %encapsulate wxArrayVideoModes
+     %overload wxArrayVideoModes()
+     %overload %constructor wxArrayVideoModesCopy(const wxArrayVideoModes& array)
+ 
+     void Add(const wxVideoMode& vm, size_t copies = 1)
+     void Alloc(size_t nCount)
+     void Clear()
+     void Empty()
+     int GetCount() const
+     void Insert(const wxVideoMode& vm, int nIndex, size_t copies = 1)
+     bool IsEmpty()
+     wxVideoMode Item(size_t nIndex) const
+     wxVideoMode Last()
+     void RemoveAt(size_t nIndex, size_t count = 1)
+     void Shrink()
+ %endclass
+ 
+ 
+ //-----------------------------------------------------------------------------
+ // wxDisplay
+ 
+ %class %noclassinfo %encapsulate wxDisplay
+     wxDisplay(size_t index = 0)
+ 
+     bool  ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode)
+     %static size_t GetCount()
+     wxVideoMode  GetCurrentMode() const
+     // int  GetDepth() const // in docs BUT not in C++ header
+     %static int GetFromPoint(const wxPoint& pt)
+     %static int GetFromWindow(wxWindow* win)
+     wxRect  GetGeometry() const
+     wxRect GetClientArea() const
+     wxArrayVideoModes  GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const
+     wxString  GetName() const
+     bool IsOk() const
+     bool  IsPrimary()
+ %endclass
+ 
+ %endif wxLUA_USE_wxDisplay & wxUSE_DISPLAY

Index: image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** image.i	17 May 2006 05:02:04 -0000	1.13
--- image.i	2 Nov 2006 23:38:08 -0000	1.14
***************
*** 162,166 ****
  
      %operator wxImage& operator=(const wxImage& image)
!     %operator bool operator==(const wxImage& image) const
  %endclass
  
--- 162,166 ----
  
      %operator wxImage& operator=(const wxImage& image)
!     //%operator bool operator==(const wxImage& image) const // not in 2.8
  %endclass