[Wxlua-commit] wxLua/bindings/wxwidgets defsutil.i,1.2,1.3 menutool.i,1.3,1.4 windows.i,1.2,1.3

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

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

Modified Files:
	defsutil.i menutool.i windows.i 
Log Message:
wxLua app should probably always load standalone bitmaps for people
wrong \ in genwxbind.bat
hack to get genwxbind.lua to work with %enums, %builtin is still broken
have editor.wx.lua use new wxToolBar::AddTool method


Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** windows.i	18 Jun 2005 20:45:59 -0000	1.2
--- windows.i	20 Jun 2005 06:55:23 -0000	1.3
***************
*** 55,59 ****
      virtual wxSize GetBestSize() const
      %property=BestSize, read
!     wxCaret * GetCaret() const
      virtual int GetCharHeight() const
      %property=CharHeight, read
--- 55,59 ----
      virtual wxSize GetBestSize() const
      %property=BestSize, read
!     wxCaret* GetCaret() const
      virtual int GetCharHeight() const
      %property=CharHeight, read
***************
*** 68,72 ****
      wxEvtHandler* GetEventHandler() const
      long GetExtraStyle() const
!     wxFont& GetFont() const
      virtual wxColour GetForegroundColour()
      wxWindow* GetGrandParent() const
--- 68,72 ----
      wxEvtHandler* GetEventHandler() const
      long GetExtraStyle() const
!     wxFont GetFont() const
      virtual wxColour GetForegroundColour()
      wxWindow* GetGrandParent() const

Index: menutool.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** menutool.i	19 Jun 2005 05:47:45 -0000	1.3
--- menutool.i	20 Jun 2005 06:55:23 -0000	1.4
***************
*** 177,180 ****
--- 177,181 ----
      wxToolBarToolBase *AddControl(wxControl *control)
      wxToolBarToolBase *AddSeparator()
+     // FIXME this was old method - There is no AddTool that takes clientData
      !%wxchkver24 wxToolBarToolBase *AddTool(int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& longHelpString = "")
      %wxchkver24 %rename AddToolSimple wxToolBarToolBase *AddTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxString& shortHelp = "", wxItemKind kind = wxITEM_NORMAL)
***************
*** 182,185 ****
--- 183,187 ----
      %wxchkver24 wxToolBarToolBase *AddCheckTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL)
      %wxchkver24 wxToolBarToolBase *AddRadioTool(int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *data = NULL)
+     // FIXME this was old method - There is no InsertTool that takes clientData
      !%wxchkver24 wxToolBarToolBase *InsertTool(size_t pos, int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool isToggle = FALSE, wxObject *clientData = NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "")
      %wxchkver24 virtual wxToolBarToolBase *InsertTool(size_t pos, int toolid, const wxString& label, const wxBitmap& bitmap, const wxBitmap& bmpDisabled = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelp = "", const wxString& longHelp = "", wxObject *clientData = NULL)

Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** defsutil.i	18 Jun 2005 20:45:58 -0000	1.2
--- defsutil.i	20 Jun 2005 06:55:23 -0000	1.3
***************
*** 90,94 ****
--- 90,108 ----
  // Time functions - see datatime.i
  
+ ///////////////////////////////////////////////////////////////////////////////
+ // wxLua platform defines - FIXME add simple method wxPlatform returning unix, msw, ...
+ 
+ %win %define wxPlatformWindows
+ %gtk %define wxPlatformGTK
+ %mac %define wxPlatformMac
+ %mgl %define wxPlatformMgl
+ %motif %define wxPlatformMotif
+ %os2 %define wxPlatformOS2
+ // %univ %define wxPlatformUniv // FIXME add this back
+ %x11 %define wxPlatformX11
+ %cocoa %define wxPlatformCocoa
  
+ ///////////////////////////////////////////////////////////////////////////////
+ // wxWidgets window IDs
  
  %if wxLUA_USE_wxID_XXX
***************
*** 148,151 ****
--- 162,222 ----
  %endif wxLUA_USE_wxID_XXX
  
+ ///////////////////////////////////////////////////////////////////////////////
+ // Generic defines and enums
+ 
+ %define wxBACKINGSTORE
+ %define wxBACKWARD
+ %define wxBOTH
+ %define wxBOTTOM
+ %define wxCANCEL
+ %define wxCENTER
+ %define wxCENTER_FRAME
+ %define wxCENTER_ON_SCREEN
+ %define wxCENTRE
+ %define wxCENTRE_ON_SCREEN
+ %define wxCOLOURED
+ //%define wxED_BUTTONS_BOTTOM  // for wxExtDialog? not used?
+ //%define wxED_BUTTONS_RIGHT
+ //%define wxED_CLIENT_MARGIN
+ //%define wxED_STATIC_LINE
+ %define wxEQUIV
+ %define wxFIXED_LENGTH
+ %define wxFORWARD
+ %define wxGTK
+ %define wxHELP
+ %define wxHORIZONTAL
+ %define wxINVERT
+ %define wxMORE
+ %define wxMOTIF_X
+ %define wxNO
+ %define wxNO_BORDER
+ %define wxNO_DEFAULT
+ %define wxOK
+ %define wxPASSWORD
+ %define wxPROCESS_ENTER
+ %define wxRESET
+ %define wxRESIZE_BOX
+ %define wxRETAINED
+ %define wxRIGHT
+ %define wxSET
+ %define wxSETUP
+ %define wxSIZE_ALLOW_MINUS_ONE
+ %define wxSIZE_AUTO
+ %define wxSIZE_AUTO_HEIGHT
+ %define wxSIZE_AUTO_WIDTH
+ %define wxSIZE_NO_ADJUSTMENTS
+ %define wxSIZE_USE_EXISTING
+ %define wxST_NO_AUTORESIZE
+ %define wxTOP
+ %define wxUNKNOWN_PLATFORM
+ //%define wxUSER_COLOURS depricated use wxNO_3D
+ %define wxVERTICAL
+ %define wxWINDOWS
+ %define wxWS_EX_VALIDATE_RECURSIVELY
+ %define wxXVIEW_X
+ %define wxYES
+ %define wxYES_DEFAULT
+ %define wxYES_NO
+ 
  %enum wxDirection
      wxLEFT