[Wxlua-commit] wxLua/bindings/wxwidgets event.i, 1.28, 1.29 help.i, 1.19, 1.20 picker.i, 1.1, 1.2 windows.i, 1.43, 1.44 wx_datatypes.lua, 1.70, 1.71

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

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

Modified Files:
	event.i help.i picker.i windows.i wx_datatypes.lua 
Log Message:
Fix compilation in MSW, add includes, etc
Change genwxbind.lua to preserve the order of conditions, fifo instead of filo
   not sure why it reversed the order before, but it doesn't seem right.


Index: help.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/help.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** help.i	18 Jun 2007 02:56:24 -0000	1.19
--- help.i	18 Jun 2007 14:54:58 -0000	1.20
***************
*** 135,142 ****
  
  %if %msw
  %class %delete wxWinHelpController, wxHelpControllerBase
-     %include "wx/helpwin.h"
      wxWinHelpController()
  %endclass
  %endif //%msw
  
--- 135,145 ----
  
  %if %msw
+ 
+ %include "wx/helpwin.h"
+ 
  %class %delete wxWinHelpController, wxHelpControllerBase
      wxWinHelpController()
  %endclass
+ 
  %endif //%msw
  
***************
*** 158,163 ****
  %class wxBestHelpController, wxHelpControllerBase
      wxBestHelpController(wxWindow* parentWindow = NULL, int style = wxHF_DEFAULT_STYLE)
- 
  %endclass
  %endif //%msw
  
--- 161,166 ----
  %class wxBestHelpController, wxHelpControllerBase
      wxBestHelpController(wxWindow* parentWindow = NULL, int style = wxHF_DEFAULT_STYLE)
  %endclass
+ 
  %endif //%msw
  
***************
*** 166,173 ****
  
  %if !%win
  %class %delete wxExtHelpController, wxHelpControllerBase
-     %include "wx/generic/helpext.h"
      wxExtHelpController()
  %endclass
  %endif //!%win
  
--- 169,179 ----
  
  %if !%win
+ 
+ %include "wx/generic/helpext.h"
+ 
  %class %delete wxExtHelpController, wxHelpControllerBase
      wxExtHelpController()
  %endclass
+ 
  %endif //!%win
  

Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** windows.i	18 Jun 2007 02:56:24 -0000	1.43
--- windows.i	18 Jun 2007 14:54:58 -0000	1.44
***************
*** 620,624 ****
      %define wxTC_OWNERDRAW
  
-     %include "wx/tabctrl.h"
      wxTabCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxTabCtrl")
      bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxTabCtrl")
--- 620,623 ----

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** wx_datatypes.lua	18 Jun 2007 02:56:25 -0000	1.70
--- wx_datatypes.lua	18 Jun 2007 14:54:58 -0000	1.71
***************
*** 201,205 ****
    wxANIHandler = {
      BaseClass = "wxCURHandler",
!     Condition = "(wxUSE_ICO_CUR) && (wxLUA_USE_wxImage && wxUSE_IMAGE)",
      DefType = "class",
      IsNumber = false,
--- 201,205 ----
    wxANIHandler = {
      BaseClass = "wxCURHandler",
!     Condition = "(wxLUA_USE_wxImage && wxUSE_IMAGE) && (wxUSE_ICO_CUR)",
      DefType = "class",
[...1362 lines suppressed...]
      IsNumber = false,
--- 3806,3810 ----
    wxXPMHandler = {
      BaseClass = "wxImageHandler",
!     Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TGA",
      DefType = "class",
      IsNumber = false,
***************
*** 3909,3913 ****
    WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)",
    WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)",
!   wxHAS_POWER_EVENTS = "wxHAS_POWER_EVENTS",
    wxLUA_USE_Animation = "wxLUA_USE_Animation",
    wxLUA_USE_FL = "wxLUA_USE_FL",
--- 3911,3915 ----
    WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)",
    WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)",
!   wxHAS_POWER_EVENTS = "defined(wxHAS_POWER_EVENTS)",
    wxLUA_USE_Animation = "wxLUA_USE_Animation",
    wxLUA_USE_FL = "wxLUA_USE_FL",

Index: event.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** event.i	18 Jun 2007 02:56:23 -0000	1.28
--- event.i	18 Jun 2007 14:54:58 -0000	1.29
***************
*** 816,819 ****
--- 816,821 ----
  // wxPowerEvent
  
+ %if %wxchkver_2_8
+ 
  %include "wx/power.h"
  
***************
*** 851,854 ****
--- 853,859 ----
  %endif // wxHAS_POWER_EVENTS
  
+ %endif %wxchkver_2_8
+ 
+ 
  // ---------------------------------------------------------------------------
  // wxSetCursorEvent

Index: picker.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/picker.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** picker.i	17 Jun 2007 18:36:06 -0000	1.1
--- picker.i	18 Jun 2007 14:54:58 -0000	1.2
***************
*** 125,128 ****
--- 125,130 ----
  %if (wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL)
  
+ %include "wx/filepicker.h"
+ 
  %class wxFileDirPickerCtrlBase, wxPickerBase
      // No constructor - this is a base class
***************
*** 165,169 ****
  
  %class wxDirPickerCtrl, wxFileDirPickerCtrlBase
!     //wxDirPickerCtrl() {}
      wxDirPickerCtrl(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDirPickerCtrl")
      //bool Create(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDirPickerCtrl")
--- 167,171 ----
  
  %class wxDirPickerCtrl, wxFileDirPickerCtrlBase
!     //wxDirPickerCtrl()
      wxDirPickerCtrl(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDirPickerCtrl")
      //bool Create(wxWindow *parent, wxWindowID id, const wxString& path = "", const wxString& message = wxDirSelectorPromptStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRP_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDirPickerCtrl")
***************
*** 202,205 ****
--- 204,209 ----
  %if wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL
  
+ %include "wx/fontpicker.h"
+ 
  %define wxFNTP_FONTDESC_AS_LABEL
  %define wxFNTP_USE_TEXTCTRL