[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i,1.16,1.17 wx_datatypes.lua,1.29,1.30

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

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

Modified Files:
	appframe.i wx_datatypes.lua 
Log Message:
change enum wxClass::XXX to be accessed as wxClass_XXX
added %staticonly keyword for classes that only have static members


Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** appframe.i	17 May 2006 05:02:04 -0000	1.16
--- appframe.i	17 May 2006 22:47:09 -0000	1.17
***************
*** 24,28 ****
  
  %class wxApp, wxEvtHandler
!     // wxApp() NO CONSTRUCTOR! the wxApp is created in C++
  
      // These two are pushed into lua by C++ at startup as table arg = { argv }
--- 24,28 ----
  
  %class wxApp, wxEvtHandler
!     // wxApp() NO CONSTRUCTOR! the wxApp is created in C++, use wxGetApp()
  
      // These two are pushed into lua by C++ at startup as table arg = { argv }
***************
*** 35,39 ****
      // virtual int FilterEvent(wxEvent& event) too dangerous, use ConnectEvent
      wxString GetAppName() const
!     %wxchkver22&!%wxchkver25&%win bool GetAuto3D() const
      wxString GetClassName() const
      bool GetExitOnFrameDelete() const
--- 35,39 ----
      // virtual int FilterEvent(wxEvent& event) too dangerous, use ConnectEvent
      wxString GetAppName() const
!     //%wxchkver22&!%wxchkver25&%win bool GetAuto3D() const
      wxString GetClassName() const
      bool GetExitOnFrameDelete() const
***************
*** 53,57 ****
      %wxchkver25 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event)
      void SetAppName(const wxString& name)
!     %wxchkver22&!%wxchkver24&(%win|%mac) void SetAuto3D(const bool auto3D)
      void SetClassName(const wxString& name)
      void SetExitOnFrameDelete(bool flag)
--- 53,57 ----
      %wxchkver25 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event)
      void SetAppName(const wxString& name)
!     //%wxchkver22&!%wxchkver24&(%win|%mac) void SetAuto3D(const bool auto3D)
      void SetClassName(const wxString& name)
      void SetExitOnFrameDelete(bool flag)
***************
*** 63,67 ****
  
      %property=AppName, read, write
!     %wxchkver22&!%wxchkver24&(%win|%mac) %property=Auto3D, read, write
      %property=ClassName, read, write
      %property=ExitOnFrameDelete, read, write
--- 63,67 ----
  
      %property=AppName, read, write
!     //%wxchkver22&!%wxchkver24&(%win|%mac) %property=Auto3D, read, write
      %property=ClassName, read, write
      %property=ExitOnFrameDelete, read, write
***************
*** 95,99 ****
  
  %class wxTopLevelWindow, wxWindow
!     // No constructors, use wxFrame or wxDialog
  
      wxIcon GetIcon() const
--- 95,99 ----
  
  %class wxTopLevelWindow, wxWindow
!     // No constructors, virtual base class, use wxFrame or wxDialog
  
      wxIcon GetIcon() const
***************
*** 162,166 ****
  
      %wxchkver24 void ProcessCommand(int id)
!     %wxchkver22&!%wxchkver24 void Command(int id)
  
      void SendSizeEvent()
--- 162,166 ----
  
      %wxchkver24 void ProcessCommand(int id)
!     //%wxchkver22&!%wxchkver24 void Command(int id)
  
      void SendSizeEvent()
***************
*** 170,174 ****
      virtual void SetStatusText(const wxString& text, int number = 0)
      // %override void wxFrame::SetStatusWidths(lua table with number indexes and values)
!     virtual void SetStatusWidths(int n, int *widths)
      void SetToolBar(wxToolBar* toolBar)
  
--- 170,175 ----
      virtual void SetStatusText(const wxString& text, int number = 0)
      // %override void wxFrame::SetStatusWidths(lua table with number indexes and values)
!     //virtual void SetStatusWidths(int n, int *widths)
!     virtual void SetStatusWidths(LuaTable intTable)
      void SetToolBar(wxToolBar* toolBar)
  
***************
*** 191,194 ****
--- 192,196 ----
      %overload %constructor wxMiniFrameDefault()
      %overload wxMiniFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "wxMiniFrame")
+ 
      bool Create(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "wxMiniFrame")
  %endclass
***************
*** 224,230 ****
      virtual void SetStatusText(const wxString& text, int i = 0)
      // %override void wxStatusBar::SetStatusWidths(lua table with number indexes and values)
!     virtual void SetStatusWidths(int n, int *widths)
      // %override void wxStatusBar::SetStatusStyles(lua table with number indexes and values)
!     virtual void SetStatusStyles(int n, int *styles)
  
      %property=FieldsCount, read
--- 226,234 ----
      virtual void SetStatusText(const wxString& text, int i = 0)
      // %override void wxStatusBar::SetStatusWidths(lua table with number indexes and values)
!     //virtual void SetStatusWidths(int n, int *widths)
!     virtual void SetStatusWidths(LuaTable intTable)
      // %override void wxStatusBar::SetStatusStyles(lua table with number indexes and values)
!     //virtual void SetStatusStyles(int n, int *styles)
!     virtual void SetStatusStyles(LuaTable intTable)
  
      %property=FieldsCount, read
***************
*** 268,272 ****
      // { { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 },
      //   { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0,   ID_0 } }
!     wxAcceleratorTable(int n, wxAcceleratorEntry* entries)
      bool Ok() const
  
--- 272,279 ----
      // { { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 },
      //   { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0,   ID_0 } }
!     //wxAcceleratorTable(int n, wxAcceleratorEntry* entries)
!     wxAcceleratorTable(LuaTable accelTable)
!     %constructor wxAcceleratorTableCopy(const wxAcceleratorTable& accel)
! 
      bool Ok() const
  
***************
*** 288,291 ****
--- 295,300 ----
  %class %delete %noclassinfo %encapsulate wxAcceleratorEntry
      wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
+     %constructor wxAcceleratorEntryCopy(const wxAcceleratorEntry& entry)
+ 
      int GetCommand() const
      int GetFlags() const
***************
*** 314,317 ****
--- 323,327 ----
  %class wxTaskBarIcon, wxEvtHandler
      wxTaskBarIcon()
+ 
      // virtual wxMenu*  CreatePopupMenu()
      bool IsIconInstalled()
***************
*** 433,442 ****
      wxSYS_COLOUR_INFOBK
      wxSYS_COLOUR_LISTBOX
! %wxchkver23     wxSYS_COLOUR_HOTLIGHT
! %wxchkver23     wxSYS_COLOUR_GRADIENTACTIVECAPTION
! %wxchkver23     wxSYS_COLOUR_GRADIENTINACTIVECAPTION
! %wxchkver23     wxSYS_COLOUR_MENUHILIGHT
! %wxchkver23     wxSYS_COLOUR_MENUBAR
! %wxchkver23     wxSYS_COLOUR_MAX
  %endenum
  
--- 443,452 ----
      wxSYS_COLOUR_INFOBK
      wxSYS_COLOUR_LISTBOX
!     wxSYS_COLOUR_HOTLIGHT
!     wxSYS_COLOUR_GRADIENTACTIVECAPTION
!     wxSYS_COLOUR_GRADIENTINACTIVECAPTION
!     wxSYS_COLOUR_MENUHILIGHT
!     wxSYS_COLOUR_MENUBAR
!     wxSYS_COLOUR_MAX
  %endenum
  
***************
*** 453,465 ****
  
  %class %noclassinfo wxSystemSettings
!     wxSystemSettings() // all members static
! 
!     %wxchkver22&!%wxchkver23 static wxColour GetSystemColour(int index)
!     %wxchkver22&!%wxchkver23 static wxFont   GetSystemFont(int index)
!     %wxchkver22&!%wxchkver23 static int GetSystemMetric(int index)
  
!     %wxchkver23 %static wxColour GetColour(wxSystemColour index)
!     %wxchkver23 %static wxFont   GetFont(wxSystemFont index)
!     %wxchkver23 %static int GetMetric(wxSystemMetric index, wxWindow* win = NULL)
  %endclass
  
--- 463,471 ----
  
  %class %noclassinfo wxSystemSettings
!     //wxSystemSettings() // all members static
  
!     %staticonly wxColour GetColour(wxSystemColour index)
!     %staticonly wxFont   GetFont(wxSystemFont index)
!     %staticonly int      GetMetric(wxSystemMetric index, wxWindow* win = NULL)
  %endclass
  
***************
*** 469,481 ****
  %include "wx/sysopt.h"
  
! %class %delete %noclassinfo wxSystemOptions, wxObject
!     // wxSystemOptions() all members static
  
!     static wxString GetOption(const wxString& name) const
!     static int GetOptionInt(const wxString& name) const
!     static bool HasOption(const wxString& name) const
!     static bool IsFalse(const wxString& name) const
!     static void SetOption(const wxString& name, const wxString& value)
!     %rename SetOptionInt static void SetOption(const wxString& name, int value)
  %endclass
  
--- 475,487 ----
  %include "wx/sysopt.h"
  
! %class %noclassinfo wxSystemOptions, wxObject
!     //wxSystemOptions() // all members static
  
!     %staticonly wxString GetOption(const wxString& name) const
!     %staticonly int GetOptionInt(const wxString& name) const
!     %staticonly bool HasOption(const wxString& name) const
!     %staticonly bool IsFalse(const wxString& name) const
!     %staticonly void SetOption(const wxString& name, const wxString& value)
!     %rename SetOptionInt %staticonly void SetOption(const wxString& name, int value)
  %endclass
  

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wx_datatypes.lua	17 May 2006 05:02:05 -0000	1.29
--- wx_datatypes.lua	17 May 2006 22:47:09 -0000	1.30
***************
*** 63,66 ****
--- 63,71 ----
      Name = "LPVOID",
    },
+   LuaTable = {
+     DefType = "wxtypedef",
+     Intrinsic = true,
+     Name = "LuaTable",
+   },
    PVOID = {
      DefType = "builtin",
***************
*** 197,200 ****
--- 202,210 ----
      Name = "wxArrayInt",
    },
+   wxArrayInt_FromLuaTable = {
+     DefType = "wxtypedef",
+     Intrinsic = true,
+     Name = "wxArrayInt_FromLuaTable",
+   },
    wxArrayString = {
      Condition = "wxLUA_USE_wxArrayString",