[Wxlua-commit] wxLua/bindings/wxwidgets dialogs.i, 1.35, 1.36 gdi.i, 1.55, 1.56 picker.i, 1.2, 1.3 windows.i, 1.46, 1.47 wx_datatypes.lua, 1.74, 1.75

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

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

Modified Files:
	dialogs.i gdi.i picker.i windows.i wx_datatypes.lua 
Log Message:
Add samples for picker and other controls
Fix some binding problems found from the samples


Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** windows.i	18 Jun 2007 21:40:32 -0000	1.46
--- windows.i	19 Jun 2007 22:26:46 -0000	1.47
***************
*** 985,989 ****
  // wxCollapsiblePane
  
! %if wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE
  
  %include "wx/collpane.h"
--- 985,989 ----
  // wxCollapsiblePane
  
! %if %wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE
  
  %include "wx/collpane.h"
***************
*** 1009,1013 ****
  
  %class %delete wxCollapsiblePaneEvent, wxCommandEvent
!     %define wxEVT_COMMAND_COLLPANE_CHANGED // EVT_COLLAPSIBLEPANE_CHANGED(id, fn)
  
      wxCollapsiblePaneEvent()
--- 1009,1013 ----
  
  %class %delete wxCollapsiblePaneEvent, wxCommandEvent
!     %define_event wxEVT_COMMAND_COLLPANE_CHANGED // EVT_COLLAPSIBLEPANE_CHANGED(id, fn)
  
      wxCollapsiblePaneEvent()
***************
*** 1018,1022 ****
  %endclass
  
! %endif // wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE
  
  // ---------------------------------------------------------------------------
--- 1018,1022 ----
  %endclass
  
! %endif // %wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE
  
  // ---------------------------------------------------------------------------

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** wx_datatypes.lua	19 Jun 2007 13:58:15 -0000	1.74
--- wx_datatypes.lua	19 Jun 2007 22:26:46 -0000	1.75
***************
*** 240,244 ****
    wxAnimation = {
      BaseClass = "wxGDIObject",
!     Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8",
      DefType = "class",
      IsNumber = false,
--- 240,244 ----
    wxAnimation = {
      BaseClass = "wxGDIObject",
!     Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL",
      DefType = "class",
      IsNumber = false,
***************
*** 247,251 ****
    wxAnimationCtrl = {
      BaseClass = "wxControl",
!     Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8",
      DefType = "class",
      IsNumber = false,
--- 247,251 ----
    wxAnimationCtrl = {
      BaseClass = "wxControl",
!     Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL",
      DefType = "class",
      IsNumber = false,
***************
*** 253,257 ****
    },
    wxAnimationType = {
!     Condition = "wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8",
      DefType = "enum",
      IsNumber = true,
--- 253,257 ----
    },
    wxAnimationType = {
!     Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL",
      DefType = "enum",
      IsNumber = true,
***************
*** 608,612 ****
    wxCollapsiblePane = {
      BaseClass = "wxControl",
!     Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE",
      DefType = "class",
      IsNumber = false,
--- 608,612 ----
    wxCollapsiblePane = {
      BaseClass = "wxControl",
!     Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE",
      DefType = "class",
      IsNumber = false,
***************
*** 615,619 ****
    wxCollapsiblePaneEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "wxchkver_2_8 && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE",
      DefType = "class",
      IsNumber = false,
--- 615,619 ----
    wxCollapsiblePaneEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxCollapsiblePane && wxUSE_COLLPANE",
      DefType = "class",
      IsNumber = false,
***************
*** 650,654 ****
    wxColourPickerCtrl = {
      BaseClass = "wxPickerBase",
!     Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)",
      DefType = "class",
      IsNumber = false,
--- 650,654 ----
    wxColourPickerCtrl = {
      BaseClass = "wxPickerBase",
!     Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)",
      DefType = "class",
      IsNumber = false,
***************
*** 657,661 ****
    wxColourPickerEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)",
      DefType = "class",
      IsNumber = false,
--- 657,661 ----
    wxColourPickerEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxColourPickerCtrl && wxUSE_COLOURPICKERCTRL)",
      DefType = "class",
      IsNumber = false,
***************
*** 850,854 ****
    wxDatePickerCtrl = {
      BaseClass = "wxControl",
!     Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)",
      DefType = "class",
      IsNumber = false,
--- 850,854 ----
    wxDatePickerCtrl = {
      BaseClass = "wxControl",
!     Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL)",
      DefType = "class",
      IsNumber = false,
***************
*** 944,948 ****
    wxDirPickerCtrl = {
      BaseClass = "wxFileDirPickerCtrlBase",
!     Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))",
      DefType = "class",
      IsNumber = false,
--- 944,948 ----
    wxDirPickerCtrl = {
      BaseClass = "wxFileDirPickerCtrlBase",
!     Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))",
      DefType = "class",
      IsNumber = false,
***************
*** 1162,1166 ****
    wxFileDirPickerCtrlBase = {
      BaseClass = "wxPickerBase",
!     Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))",
      DefType = "class",
      IsNumber = false,
--- 1162,1166 ----
    wxFileDirPickerCtrlBase = {
      BaseClass = "wxPickerBase",
!     Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))",
      DefType = "class",
      IsNumber = false,
***************
*** 1169,1173 ****
    wxFileDirPickerEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))",
      DefType = "class",
      IsNumber = false,
--- 1169,1173 ----
    wxFileDirPickerEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && ((wxLUA_USE_wxDirPickerCtrl || wxLUA_USE_wxFilePickerCtrl ) && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))",
      DefType = "class",
      IsNumber = false,
***************
*** 1215,1219 ****
    wxFilePickerCtrl = {
      BaseClass = "wxFileDirPickerCtrlBase",
!     Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))",
      DefType = "class",
      IsNumber = false,
--- 1215,1219 ----
    wxFilePickerCtrl = {
      BaseClass = "wxFileDirPickerCtrlBase",
!     Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxDirPickerCtrl && (wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL ))",
      DefType = "class",
      IsNumber = false,
***************
*** 1353,1357 ****
    wxFontPickerCtrl = {
      BaseClass = "wxPickerBase",
!     Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)",
      DefType = "class",
      IsNumber = false,
--- 1353,1357 ----
    wxFontPickerCtrl = {
      BaseClass = "wxPickerBase",
!     Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)",
      DefType = "class",
      IsNumber = false,
***************
*** 1360,1364 ****
    wxFontPickerEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "(wxchkver_2_8 && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)",
      DefType = "class",
      IsNumber = false,
--- 1360,1364 ----
    wxFontPickerEvent = {
      BaseClass = "wxCommandEvent",
!     Condition = "(wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker) && (wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL)",
      DefType = "class",
      IsNumber = false,
***************
*** 2692,2696 ****
    wxPickerBase = {
      BaseClass = "wxControl",
!     Condition = "wxchkver_2_8 && wxLUA_USE_wxPicker",
      DefType = "class",
      IsNumber = false,
--- 2692,2696 ----
    wxPickerBase = {
      BaseClass = "wxControl",
!     Condition = "wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxPicker",
      DefType = "class",
      IsNumber = false,

Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** gdi.i	18 Jun 2007 21:40:31 -0000	1.55
--- gdi.i	19 Jun 2007 22:26:46 -0000	1.56
***************
*** 1662,1666 ****
  // wxAnimation
  
! %if wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8
  
  %include "wx/animate.h"
--- 1662,1666 ----
  // wxAnimation
  
! %if %wxchkver_2_8 && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL
  
  %include "wx/animate.h"
***************
*** 1714,1716 ****
  %endclass
  
! %endif // wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL && wxchkver_2_8
--- 1714,1716 ----
  %endclass
  
! %endif // %wxchkver_2_8 && wxLUA_USE_Animation && wxUSE_ANIMATIONCTRL

Index: picker.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/picker.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** picker.i	18 Jun 2007 14:54:58 -0000	1.2
--- picker.i	19 Jun 2007 22:26:46 -0000	1.3
***************
*** 8,12 ****
  // ===========================================================================
  
! %if wxchkver_2_8 && wxLUA_USE_wxPicker
  
  // ---------------------------------------------------------------------------
--- 8,12 ----
  // ===========================================================================
  
! %if %wxchkver_2_8 && wxLUA_USE_wxPicker
  
  // ---------------------------------------------------------------------------
***************
*** 97,102 ****
  %include "wx/datectrl.h"
  
  %enum
!     wxDP_SPIN
      wxDP_DROPDOWN
      wxDP_DEFAULT
--- 97,104 ----
  %include "wx/datectrl.h"
  
+ // Note: this sends a wxDateEvent wxEVT_DATE_CHANGED // EVT_DATE_CHANGED(id, fn)
+ 
  %enum
!     wxDP_SPIN           // MSW only
      wxDP_DROPDOWN
      wxDP_DEFAULT
***************
*** 207,213 ****
  
  %define wxFNTP_FONTDESC_AS_LABEL
! %define wxFNTP_USE_TEXTCTRL
  %define wxFNTP_DEFAULT_STYLE
! %define wxFNTP_MAXPOINT_SIZE
  
  %class wxFontPickerCtrl, wxPickerBase
--- 209,217 ----
  
  %define wxFNTP_FONTDESC_AS_LABEL
! %define wxFNTP_USEFONT_FOR_LABEL
! %define wxFNTP_USE_TEXTCTRL         // (wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL)
  %define wxFNTP_DEFAULT_STYLE
! 
! %define wxFNTP_MAXPOINT_SIZE // 100 the default max size to allow
  
  %class wxFontPickerCtrl, wxPickerBase
***************
*** 239,243 ****
  %endif // wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL
  
! %endif // wxchkver_2_8 && wxLUA_USE_wxPicker
  
  
--- 243,247 ----
  %endif // wxLUA_USE_wxFontPickerCtrl && wxUSE_FONTPICKERCTRL
  
! %endif // %wxchkver_2_8 && wxLUA_USE_wxPicker
  
  

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** dialogs.i	18 Jun 2007 02:56:23 -0000	1.35
--- dialogs.i	19 Jun 2007 22:26:46 -0000	1.36
***************
*** 52,55 ****
--- 52,56 ----
  // %function wxTipProvider* wxCreateFileTipProvider(const wxString& filename, size_t currentTip)
  
+ %define_string wxDirSelectorPromptStr
  %function wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& default_path = "", long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, wxWindow *parent = NULL)
  %function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1)
***************
*** 231,234 ****
--- 232,238 ----
  %include "wx/filedlg.h"
  
+ %define_string wxFileSelectorPromptStr
+ %define_string wxFileSelectorDefaultWildcardStr
+ 
  %class wxFileDialog, wxDialog
      // wxFileDialog() no default constructor in MSW