[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.45, 1.46 controls.i, 1.45, 1.46 override.hpp, 1.80, 1.81 wrappers.lst, 1.1, 1.2 fl.i, 1.10, NONE

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

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

Modified Files:
	appframe.i controls.i override.hpp wrappers.lst 
Removed Files:
	fl.i 
Log Message:
Remove fl lib, it's not going to be used
fix toolbar in scribble


--- fl.i DELETED ---

Index: wrappers.lst
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wrappers.lst,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wrappers.lst	7 Jun 2005 04:17:38 -0000	1.1
--- wrappers.lst	30 Jun 2007 18:18:44 -0000	1.2
***************
*** 10,14 ****
  event.i    \
  file.i     \
- fl.i       \
  gdi.i      \
  geometry.i \
--- 10,13 ----

Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** appframe.i	27 Jun 2007 19:56:28 -0000	1.45
--- appframe.i	30 Jun 2007 18:18:44 -0000	1.46
***************
*** 21,24 ****
--- 21,27 ----
  %function void wxSafeShowMessage(const wxString& title, const wxString& text)
  
+ // All of the wxLogXXX functions take only a single string,
+ // use string.format(...) to format the string in lua.
+ 
  // C++ Func: void wxLogError(const char *formatString, ...)
  %function void wxLogError(const wxString& message)
***************
*** 32,36 ****
  %function void wxLogVerbose(const wxString& message)
  // C++ Func: void wxLogStatus(wxFrame *frame, const char *formatString, ...)
! // void wxLogStatus(const char *formatString, ...) // this just uses the toplevel frame
  %function void wxLogStatus(wxFrame *frame, const wxString& message)
  // C++ Func: void wxLogSysError(const char *formatString, ...)
--- 35,39 ----
  %function void wxLogVerbose(const wxString& message)
  // C++ Func: void wxLogStatus(wxFrame *frame, const char *formatString, ...)
! // void wxLogStatus(const char *formatString, ...) // this just uses the toplevel frame, use wx.NULL for the frame
  %function void wxLogStatus(wxFrame *frame, const wxString& message)
  // C++ Func: void wxLogSysError(const char *formatString, ...)
***************
*** 43,47 ****
  // void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated
  
! %enum
      wxLOG_FatalError, // program can't continue, abort immediately
      wxLOG_Error,      // a serious error, user must be informed about it
--- 46,53 ----
  // void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated
  
! %typedef wxTraceMask unsigned long
! %typedef wxLogLevel unsigned long
! 
! %enum // wxLogLevel - uses these enums
      wxLOG_FatalError, // program can't continue, abort immediately
      wxLOG_Error,      // a serious error, user must be informed about it
***************
*** 53,56 ****
--- 59,63 ----
      wxLOG_Trace,      // trace messages are also only enabled in debug mode
      wxLOG_Progress,   // used for progress indicator (not yet)
+ 
      wxLOG_User,       // user defined levels start here
      wxLOG_Max
***************
*** 66,72 ****
  %msw %define_string wxTRACE_OleCalls //wxT("ole") // OLE interface calls
  
- %typedef wxLogLevel unsigned long
- %typedef wxTraceMask unsigned long
- 
  %class %delete %noclassinfo %encapsulate wxLog
      //wxLog() - No constructor, a base class, use one of the derived classes.
--- 73,76 ----
***************
*** 201,205 ****
  
      void Show(bool show = true)
!     wxFrame *  GetFrame() const
  
      //virtual void OnFrameCreate(wxFrame *frame)
--- 205,209 ----
  
      void Show(bool show = true)
!     wxFrame* GetFrame() const
  
      //virtual void OnFrameCreate(wxFrame *frame)
***************
*** 500,504 ****
      bool Ok() const
  
!     // believe it or not, there aren't functions to add or remove entries for MSW
  
      // operators are WXWIN_COMPATIBILITY_2_4
--- 504,508 ----
      bool Ok() const
  
!     // believe it or not, there aren't functions to add or remove wxAcceleratorEntries for MSW
  
      // operators are WXWIN_COMPATIBILITY_2_4
***************
*** 557,563 ****
      // virtual bool PopupMenu(wxMenu* menu)
  
!     // call RemoveIcon() if you want your program to exit, must have called SetIcon()
      bool RemoveIcon()
!     // call SetIcon() if have the taskbar icon displayed
      bool SetIcon(const wxIcon& icon, const wxString& tooltip)
  %endclass
--- 561,567 ----
      // virtual bool PopupMenu(wxMenu* menu)
  
!     // call RemoveIcon() or delete this if you want your program to exit, must have called SetIcon()
      bool RemoveIcon()
!     // call SetIcon() to have the taskbar icon displayed
      bool SetIcon(const wxIcon& icon, const wxString& tooltip)
  %endclass
***************
*** 694,698 ****
  
  %class %noclassinfo wxSystemSettings
!     //wxSystemSettings() // all members static
  
      static wxColour GetColour(wxSystemColour index)
--- 698,702 ----
  
  %class %noclassinfo wxSystemSettings
!     //wxSystemSettings() // No constructor, all members static
  
      static wxColour GetColour(wxSystemColour index)
***************
*** 897,901 ****
      bool IsOk() const
  
!     //bool operator==(const wxPlatformInfo &t) const;
      //bool operator!=(const wxPlatformInfo &t) const
  %endclass
--- 901,905 ----
      bool IsOk() const
  
!     //bool operator==(const wxPlatformInfo &t) const; // we only use the wxWidget's wxPlatformInfo
      //bool operator!=(const wxPlatformInfo &t) const
  %endclass
***************
*** 939,943 ****
  
  %class %delete %noclassinfo %encapsulate wxDynamicLibraryDetails
!     // ctor, normally never used as these objects are only created by
      // wxDynamicLibrary::ListLoaded()
      //wxDynamicLibraryDetails() { m_address = NULL; m_length = 0; }
--- 943,947 ----
  
  %class %delete %noclassinfo %encapsulate wxDynamicLibraryDetails
!     // ctor, normally never used as these objects are only created by wxDynamicLibrary
      // wxDynamicLibrary::ListLoaded()
      //wxDynamicLibraryDetails() { m_address = NULL; m_length = 0; }

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** override.hpp	25 Jun 2007 03:19:37 -0000	1.80
--- override.hpp	30 Jun 2007 18:18:44 -0000	1.81
***************
*** 2147,2153 ****
  
  // ----------------------------------------------------------------------------
- // Overrides for fl.i
- // ----------------------------------------------------------------------------
- // ----------------------------------------------------------------------------
  // Overrides for gdi.i
  // ----------------------------------------------------------------------------
--- 2147,2150 ----

Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** controls.i	25 Jun 2007 03:19:37 -0000	1.45
--- controls.i	30 Jun 2007 18:18:44 -0000	1.46
***************
*** 482,486 ****
      //void     SetWindowStyleFlag(long style) - see wxWindow
  
- 
      // %override bool SortItems(lua function(long item1, long item2, long data) returning int, long data)
      // C++ Func: bool SortItems(wxListCtrlCompare fnSortCallBack, long data)
--- 482,485 ----