wxlua-commit

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

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

Modified Files:
	appframe.i config.i controls.i defsutil.i gdi.i html.i image.i 
	menutool.i wave.i windows.i wx_datatypes.lua 
Log Message:
update bindings to wxWidgets 2.8 using headers, to menuitem.h
remove duplicate %defines and %enums


Index: config.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/config.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** config.i	9 Mar 2007 06:10:15 -0000	1.17
--- config.i	14 Mar 2007 05:08:09 -0000	1.18
***************
*** 127,130 ****
--- 127,140 ----
  
  //-----------------------------------------------------------------------------
+ // wxMemoryConfig
+ 
+ %include "wx/memconf.h"
+ 
+ %class %noclassinfo wxMemoryConfig, wxFileConfig
+     wxMemoryConfig()
+ 
+ %endclass
+ 
+ //-----------------------------------------------------------------------------
  // wxConfigPathChanger
  

Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wave.i	9 Mar 2007 00:15:12 -0000	1.15
--- wave.i	14 Mar 2007 05:08:09 -0000	1.16
***************
*** 13,24 ****
  //  wxSound
  
  %if %wxchkver_2_6 & wxUSE_SOUND
  
  %include "wx/sound.h"
  
- %define wxSOUND_SYNC
- %define wxSOUND_ASYNC
- %define wxSOUND_LOOP
- 
  %class %delete %noclassinfo wxSound, wxObject
      %constructor wxSoundDefault()
--- 13,24 ----
  //  wxSound
  
+ wxUSE_SOUND|(%msw&wxUSE_WAVE) %define wxSOUND_SYNC
+ wxUSE_SOUND|(%msw&wxUSE_WAVE) %define wxSOUND_ASYNC
+ wxUSE_SOUND|(%msw&wxUSE_WAVE) %define wxSOUND_LOOP
+ 
  %if %wxchkver_2_6 & wxUSE_SOUND
  
  %include "wx/sound.h"
  
  %class %delete %noclassinfo wxSound, wxObject
      %constructor wxSoundDefault()
***************
*** 44,51 ****
  %include "wx/wave.h"
  
- %win %define wxSOUND_SYNC
- %win %define wxSOUND_ASYNC
- %win %define wxSOUND_LOOP
- 
  %class %delete %noclassinfo wxWave, wxObject
      wxWave(const wxString& fileName, bool isResource = false)
--- 44,47 ----
***************
*** 81,88 ****
  %endenum
  
! %define %string wxMEDIABACKEND_DIRECTSHOW
! %define %string wxMEDIABACKEND_MCI
! %define %string wxMEDIABACKEND_QUICKTIME
! %define %string wxMEDIABACKEND_GSTREAMER
  
  %class wxMediaCtrl, wxControl
--- 77,86 ----
  %endenum
  
! %define %string wxMEDIABACKEND_DIRECTSHOW   //wxT("wxAMMediaBackend")
! %define %string wxMEDIABACKEND_MCI          //wxT("wxMCIMediaBackend")
! %define %string wxMEDIABACKEND_QUICKTIME    //wxT("wxQTMediaBackend")
! %define %string wxMEDIABACKEND_GSTREAMER    //wxT("wxGStreamerMediaBackend")
! %wxchkver_2_8 %define %string wxMEDIABACKEND_REALPLAYER   //wxT("wxRealPlayerMediaBackend")
! %wxchkver_2_8 %define %string wxMEDIABACKEND_WMP10        //wxT("wxWMP10MediaBackend")
  
  %class wxMediaCtrl, wxControl
***************
*** 91,106 ****
  
      bool Create( wxWindow* parent, wxWindowID winid, const wxString& fileName = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& szBackend = "", const wxValidator& val = wxDefaultValidator, const wxString& name = "wxMediaCtrl"  )
!     wxFileOffset GetDownloadProgress()
!     wxFileOffset GetDownloadTotal()
      wxMediaState GetState()
      bool Load(const wxString& fileName)
      %rename LoadFromURI bool Load(const wxURI& location)
      bool Pause()
      bool Play()
!     wxFileOffset Seek(wxFileOffset where, wxSeekMode mode)
      bool Stop()
      bool SetVolume(double dVolume)
      double GetVolume()
!     bool ShowPlayerControls(wxMediaCtrlPlayerControls flags)
  %endclass
  
--- 89,112 ----
  
      bool Create( wxWindow* parent, wxWindowID winid, const wxString& fileName = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& szBackend = "", const wxValidator& val = wxDefaultValidator, const wxString& name = "wxMediaCtrl"  )
!     wxFileOffset GetDownloadProgress()  // DirectShow only
!     wxFileOffset GetDownloadTotal()     // DirectShow only
      wxMediaState GetState()
+     double GetVolume()
+     wxFileOffset Length()
      bool Load(const wxString& fileName)
      %rename LoadFromURI bool Load(const wxURI& location)
+     %rename LoadFromURIWithProxy bool Load(const wxURI& location, const wxURI& proxy)
+     bool LoadURI(const wxString& fileName) // {   return Load(wxURI(fileName));       }
+     bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy) // {   return Load(wxURI(fileName), wxURI(proxy));       }
      bool Pause()
      bool Play()
!     wxFileOffset Seek(wxFileOffset where, wxSeekMode mode = wxFromStart)
      bool Stop()
      bool SetVolume(double dVolume)
      double GetVolume()
!     bool ShowPlayerControls(wxMediaCtrlPlayerControls flags = wxMEDIACTRLPLAYERCONTROLS_DEFAULT)
!     wxFileOffset Tell();
! 
! 
  %endclass
  
***************
*** 111,114 ****
--- 117,123 ----
  %define wxMEDIA_STOP_ID
  %define wxMEDIA_LOADED_ID
+ %wxchkver_2_6_4 %define wxMEDIA_STATECHANGED_ID
+ %wxchkver_2_6_4 %define wxMEDIA_PLAY_ID
+ %wxchkver_2_6_4 %define wxMEDIA_PAUSE_ID
  
  %class %delete wxMediaEvent, wxNotifyEvent
***************
*** 116,119 ****
--- 125,131 ----
      %define %event wxEVT_MEDIA_STOP
      %define %event wxEVT_MEDIA_LOADED
+     %wxchkver_2_6_4 %define %event wxEVT_MEDIA_STATECHANGED
+     %wxchkver_2_6_4 %define %event wxEVT_MEDIA_PLAY
+     %wxchkver_2_6_4 %define %event wxEVT_MEDIA_PAUSE
  
      wxMediaEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** wx_datatypes.lua	13 Mar 2007 23:01:53 -0000	1.56
--- wx_datatypes.lua	14 Mar 2007 05:08:09 -0000	1.57
***************
*** 2144,2147 ****
--- 2144,2154 ----
      Name = "wxMediaState",
    },
+   wxMemoryConfig = {
+     BaseClass = "wxFileConfig",
+     Condition = "wxLUA_USE_wxConfig && wxUSE_CONFIG",
+     DefType = "class",
+     IsNumber = false,
+     Name = "wxMemoryConfig",
+   },
    wxMemoryDC = {
      BaseClass = "wxDC",
***************
*** 3637,3640 ****
--- 3644,3648 ----
    ["%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)",

Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** appframe.i	13 Mar 2007 23:01:53 -0000	1.29
--- appframe.i	14 Mar 2007 05:08:09 -0000	1.30
***************
*** 265,269 ****
  %define wxSTAY_ON_TOP
  %define wxSYSTEM_MENU
! %define wxSIMPLE_BORDER
  %define wxRESIZE_BORDER
  
--- 265,269 ----
  %define wxSTAY_ON_TOP
  %define wxSYSTEM_MENU
! //%define wxSIMPLE_BORDER see wxWindow defines
  %define wxRESIZE_BORDER
  

Index: image.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** image.i	13 Mar 2007 23:01:53 -0000	1.21
--- image.i	14 Mar 2007 05:08:09 -0000	1.22
***************
*** 18,22 ****
      wxBITMAP_TYPE_BMP_RESOURCE
      wxBITMAP_TYPE_RESOURCE
-     wxBITMAP_TYPE_BMP_RESOURCE
      wxBITMAP_TYPE_ICO
      wxBITMAP_TYPE_ICO_RESOURCE
--- 18,21 ----

Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** windows.i	13 Mar 2007 23:01:53 -0000	1.31
--- windows.i	14 Mar 2007 05:08:09 -0000	1.32
***************
*** 447,454 ****
  %include "wx/notebook.h"
  
! %define wxNB_FIXEDWIDTH
! %define wxNB_MULTILINE
! 
! %if !%wxchkver_2_7|%wxcompat_2_6
      %define wxNB_TOP  // use wxBK_XXX after 2.6
      %define wxNB_LEFT
--- 447,451 ----
  %include "wx/notebook.h"
  
! //%if !%wxchkver_2_7|%wxcompat_2_6
      %define wxNB_TOP  // use wxBK_XXX after 2.6
      %define wxNB_LEFT
***************
*** 458,462 ****
      %define wxNB_MULTILINE
      %define wxNB_NOPAGETHEME
! %endif // !%wxchkver_2_7|%wxcompat_2_6
  
  %enum
--- 455,459 ----
      %define wxNB_MULTILINE
      %define wxNB_NOPAGETHEME
! //%endif // !%wxchkver_2_7|%wxcompat_2_6
  
  %enum

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** gdi.i	13 Mar 2007 23:01:53 -0000	1.43
--- gdi.i	14 Mar 2007 05:08:09 -0000	1.44
***************
*** 478,482 ****
      // accessors and modifiers for the font elements
      int GetPointSize() const
!     wxSize GetPixelSize() const
      wxFontStyle GetStyle() const
      wxFontWeight GetWeight() const
--- 478,482 ----
      // accessors and modifiers for the font elements
      int GetPointSize() const
!     %wxchkver_2_8_1 wxSize GetPixelSize() const
      wxFontStyle GetStyle() const
      wxFontWeight GetWeight() const
***************
*** 487,491 ****
  
      void SetPointSize(int pointsize)
!     void SetPixelSize(const wxSize& pixelSize)
      void SetStyle(wxFontStyle style)
      void SetWeight(wxFontWeight weight)
--- 487,491 ----
  
      void SetPointSize(int pointsize)
!     %wxchkver_2_8_1 void SetPixelSize(const wxSize& pixelSize)
      void SetStyle(wxFontStyle style)
      void SetWeight(wxFontWeight weight)

Index: html.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** html.i	12 Mar 2007 23:12:31 -0000	1.15
--- html.i	14 Mar 2007 05:08:09 -0000	1.16
***************
*** 131,135 ****
  %define wxHTML_ALIGN_RIGHT
  %define wxHTML_ALIGN_BOTTOM
- %define wxHTML_ALIGN_CENTER
  %define wxHTML_ALIGN_TOP
  
--- 131,134 ----

Index: menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** menutool.i	9 Mar 2007 00:15:12 -0000	1.13
--- menutool.i	14 Mar 2007 05:08:09 -0000	1.14
***************
*** 104,107 ****
--- 104,109 ----
      void SetLabelTop(int pos, const wxString& label)
  
+     %wxchkver_2_8 virtual void UpdateMenus()
+ 
      %property=MenuCount, read
  %endclass

Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** controls.i	13 Mar 2007 23:01:53 -0000	1.32
--- controls.i	14 Mar 2007 05:08:09 -0000	1.33
***************
*** 337,343 ****
  %define wxLC_ICON
  %define wxLC_LIST
- %define wxLC_MASK_ALIGN
- %define wxLC_MASK_SORT
- %define wxLC_MASK_TYPE
  %define wxLC_NO_HEADER
  %define wxLC_NO_SORT_HEADER
--- 337,340 ----
***************
*** 843,848 ****
  %include "wx/spinctrl.h"
  
! %define wxSP_ARROW_KEYS
! %define wxSP_WRAP
  
  %class wxSpinCtrl, wxControl
--- 840,845 ----
  %include "wx/spinctrl.h"
  
! //%define wxSP_ARROW_KEYS   see wxSpinButton
! //%define wxSP_WRAP         see wxSpinButton
  
  %class wxSpinCtrl, wxControl

Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** defsutil.i	13 Mar 2007 23:01:53 -0000	1.36
--- defsutil.i	14 Mar 2007 05:08:09 -0000	1.37
***************
*** 477,481 ****
  %define wxBACKINGSTORE
  %define wxBACKWARD
- %define wxBOTTOM
  %define wxCANCEL
  %define wxCENTER
--- 477,480 ----
***************
*** 489,498 ****
  //%define wxED_CLIENT_MARGIN
  //%define wxED_STATIC_LINE
- %define wxEQUIV
  %define wxFIXED_LENGTH
  %define wxFORWARD
- %define wxGTK
  %define wxHELP
- %define wxINVERT
  %define wxMORE
  %define wxNO
--- 488,494 ----
***************
*** 505,510 ****
  %define wxRESIZE_BOX
  %define wxRETAINED
- %define wxRIGHT
- %define wxSET
  %define wxSETUP
  %define wxSIZE_ALLOW_MINUS_ONE
--- 501,504 ----
***************
*** 514,521 ****
  %define wxSIZE_NO_ADJUSTMENTS
  %define wxSIZE_USE_EXISTING
- %define wxTOP
- %define wxUNKNOWN_PLATFORM
  //%define wxUSER_COLOURS deprecated use wxNO_3D
- %define wxWS_EX_VALIDATE_RECURSIVELY
  %define wxYES
  %define wxYES_DEFAULT
--- 508,512 ----