[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.26, 1.27 controls.i, 1.26, 1.27 gdi.i, 1.37, 1.38 image.i, 1.16, 1.17 windows.i, 1.26, 1.27

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

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

Modified Files:
	appframe.i controls.i gdi.i image.i windows.i 
Log Message:
start updating bindings to 2.8 by diffing headers to 2.6


Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** windows.i	23 Feb 2007 04:35:30 -0000	1.26
--- windows.i	1 Mar 2007 23:12:31 -0000	1.27
***************
*** 354,357 ****
--- 354,374 ----
  %include "wx/bookctrl.h"
  
+ %if %wxchkver28
+     %define wxBK_DEFAULT
+     %define wxBK_TOP
+     %define wxBK_LEFT
+     %define wxBK_RIGHT
+     %define wxBK_BOTTOM
+     %define wxBK_ALIGN_MASK
+ 
+     %enum
+         wxBK_HITTEST_NOWHERE
+         wxBK_HITTEST_ONICON
+         wxBK_HITTEST_ONLABEL
+         wxBK_HITTEST_ONITEM
+         wxBK_HITTEST_ONPAGE
+     %endenum
+ %endif // %wxchkver28
+ 
  %class wxBookCtrlBase, wxControl
      // no constructors, base class
***************
*** 378,381 ****
--- 395,416 ----
      virtual int  SetSelection(size_t n)
  
+     %if %wxchkver_2_8
+         unsigned int GetInternalBorder() const
+         void SetInternalBorder(unsigned int border)
+         void SetControlMargin(int margin)
+         int GetControlMargin() const
+         bool IsVertical() const
+         void SetFitToCurrentPage(bool fit)
+         bool GetFitToCurrentPage() const
+ 
+         // virtual int ChangeSelection(size_t n) = 0; FIXME pure virtual
+ 
+         //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
      %property=PageCount, read
***************
*** 410,425 ****
  %define wxNB_MULTILINE
  
! !%wxchkver27|%wxcompat26 %define wxNB_TOP  // use wxBK_XXX after 2.6
! !%wxchkver27|%wxcompat26 %define wxNB_LEFT
! !%wxchkver27|%wxcompat26 %define wxNB_RIGHT
! !%wxchkver27|%wxcompat26 %define wxNB_BOTTOM
! !%wxchkver27|%wxcompat26 %define wxNB_FIXEDWIDTH
! !%wxchkver27|%wxcompat26 %define wxNB_MULTILINE
! !%wxchkver27|%wxcompat26 %define wxNB_NOPAGETHEME
! 
! %wxchkver27 %define wxBK_TOP
! %wxchkver27 %define wxBK_LEFT
! %wxchkver27 %define wxBK_RIGHT
! %wxchkver27 %define wxBK_BOTTOM
  
  %enum
--- 445,457 ----
  %define wxNB_MULTILINE
  
! %if !%wxchkver27|%wxcompat26
!     %define wxNB_TOP  // use wxBK_XXX after 2.6
!     %define wxNB_LEFT
!     %define wxNB_RIGHT
!     %define wxNB_BOTTOM
!     %define wxNB_FIXEDWIDTH
!     %define wxNB_MULTILINE
!     %define wxNB_NOPAGETHEME
! %endif // !%wxchkver27|%wxcompat26
  
  %enum

Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** controls.i	23 Feb 2007 04:35:30 -0000	1.26
--- controls.i	1 Mar 2007 23:12:31 -0000	1.27
***************
*** 50,57 ****
--- 50,59 ----
      wxBitmap GetBitmapDisabled() const
      wxBitmap GetBitmapFocus() const
+     %wxchkver_2_8 wxBitmap GetBitmapHover() const
      wxBitmap GetBitmapLabel() const
      wxBitmap GetBitmapSelected() const
      void     SetBitmapDisabled(const wxBitmap& bitmap)
      void     SetBitmapFocus(const wxBitmap& bitmap)
+     %wxchkver_2_8 void SetBitmapHover(const wxBitmap& hover)
      void     SetBitmapLabel(const wxBitmap& bitmap)
      void     SetBitmapSelected(const wxBitmap& bitmap)

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** gdi.i	23 Feb 2007 04:35:30 -0000	1.37
--- gdi.i	1 Mar 2007 23:12:31 -0000	1.38
***************
*** 746,749 ****
--- 746,750 ----
      bool LoadFile(const wxString& name, wxBitmapType type)
      bool Ok() const
+     %wxchkver_2_8 virtual wxColour QuantizeColour(const wxColour& colour) const
      //%win static bool RemoveHandler(const wxString& name)
      bool SaveFile(const wxString& name, wxBitmapType type, wxPalette* palette = NULL)

Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** appframe.i	23 Feb 2007 04:35:30 -0000	1.26
--- appframe.i	1 Mar 2007 23:12:31 -0000	1.27
***************
*** 304,308 ****
      wxACCEL_CTRL
      wxACCEL_SHIFT
!     wxACCEL_CMD // Command key on OS X else ctrl
  %endenum
  
--- 304,308 ----
      wxACCEL_CTRL
      wxACCEL_SHIFT
!     %wxchkver_2_8 wxACCEL_CMD // Command key on OS X else wxACCEL_CTRL
  %endenum
  
***************
*** 316,319 ****
--- 316,326 ----
      void Set(int flags, int keyCode, int Cmd)
  
+     %if %wxchkver_2_8
+         %staticonly wxAcceleratorEntry *Create(const wxString& str)
+         bool IsOk() const
+         wxString ToString() const
+         bool FromString(const wxString& str)
+     %endif // %wxchkver_2_8
+ 
      // these are probably not necessary
      //%operator wxAcceleratorEntry& operator=(const wxAcceleratorEntry& entry)

Index: image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** image.i	23 Feb 2007 04:35:30 -0000	1.16
--- image.i	1 Mar 2007 23:12:31 -0000	1.17
***************
*** 430,436 ****
--- 430,447 ----
      // wxArtProvider() - abstract class
  
+     %if %wxchkver_2_8
+         %static void Push(wxArtProvider *provider)
+         %static void Insert(wxArtProvider *provider)
+         %static bool Pop()
+         %static bool Remove(wxArtProvider *provider)
+         %static bool Delete(wxArtProvider *provider)
+     %endif // %wxchkver_2_8
+ 
+     //%if !%wxcompat_2_6
      //static void PushProvider(wxArtProvider *provider) FIXME add wxLuaArtProvider maybe?
      //static bool PopProvider()
      //static bool RemoveProvider(wxArtProvider *provider)
+     //%endif // !%wxcompat_2_6
+ 
      %static wxBitmap GetBitmap(const wxString& id, const wxString& client = wxART_OTHER, const wxSize& size = wxDefaultSize)
      %static wxIcon GetIcon(const wxString& id, const wxString& client = wxART_OTHER, const wxSize& size = wxDefaultSize)