[Wxlua-commit] wxLua/apps/wxluaedit/src wxledit.h, 1.18, 1.19 wxluaedit.cpp, 1.34, 1.35

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9448/wxLua/apps/wxluaedit/src

Modified Files:
	wxledit.h wxluaedit.cpp 
Log Message:
Fix for MingW added in wxWidgets bindings for wxDefaultPoint and wxEVT_FILEPICKER/DIRPICKER...
Rename the functions to get the type names from wxLua to match closer to the lua type() function, wxlua.i
Change op_add_assign to just op_iadd (others as well) = op_assign is now op_set


Index: wxledit.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxledit.h	8 May 2007 00:55:12 -0000	1.18
--- wxledit.h	30 Jun 2007 00:12:17 -0000	1.19
***************
*** 31,38 ****
  // we use the following macro to do a compile-time check of wxLuaEdit version
  #if !defined(wxCHECK_STE_VERSION)
!     #error "wxStEdit version is too old, need at least version 1.2.4"
  #endif
! #if !wxCHECK_STE_VERSION(1, 2, 3)
!     #error "wxStEdit version is too old, need at least version 1.2.4"
  #endif
  
--- 31,38 ----
  // we use the following macro to do a compile-time check of wxLuaEdit version
  #if !defined(wxCHECK_STE_VERSION)
!     #error "wxStEdit version is too old, need at least version 1.2.5"
  #endif
! #if !wxCHECK_STE_VERSION(1, 2, 5)
!     #error "wxStEdit version is too old, need at least version 1.2.5"
  #endif
  
***************
*** 112,119 ****
      // Using a customized wxLuaState by handling wxEVT_LUASHELL_wxLUA_CREATION event:
      //   The RecreatewxLuaState function sends a wxLuaEvent with this control's id
!     //   in GetId(), *this as the GetEventObject(), and the preferred window ID 
      //   for the new wxLuaState in event.GetExtraLong() (typically wxID_ANY) and
      //   the current wxLuaState in GetwxLuaState().
!     // 
      //   Your wxEVT_LUASHELL_wxLUA_CREATION event handler can set the new wxLuaState
      //   by calling event.SetwxLuaState(wxLuaState(...))
--- 112,119 ----
      // Using a customized wxLuaState by handling wxEVT_LUASHELL_wxLUA_CREATION event:
      //   The RecreatewxLuaState function sends a wxLuaEvent with this control's id
!     //   in GetId(), *this as the GetEventObject(), and the preferred window ID
      //   for the new wxLuaState in event.GetExtraLong() (typically wxID_ANY) and
      //   the current wxLuaState in GetwxLuaState().
!     //
      //   Your wxEVT_LUASHELL_wxLUA_CREATION event handler can set the new wxLuaState
      //   by calling event.SetwxLuaState(wxLuaState(...))
***************
*** 123,129 ****
      //   to that of this window so this can handle the events.
      //
!     //   If the event is skipped or not handled the RecreatewxLuaState function 
      //   will call SetLuaIntpreter(event.GetLuaInterpreter(), event.GetInt() == 1)
!     //   if the event's wxLuaState is valid. You can Skip(false) the event to 
      //   not have the wxLuaState recreated at all.
      virtual bool RecreatewxLuaState(wxEvtHandler *wxlStateEvtHandler, int win_id);
--- 123,129 ----
      //   to that of this window so this can handle the events.
      //
!     //   If the event is skipped or not handled the RecreatewxLuaState function
      //   will call SetLuaIntpreter(event.GetLuaInterpreter(), event.GetInt() == 1)
!     //   if the event's wxLuaState is valid. You can Skip(false) the event to
      //   not have the wxLuaState recreated at all.
      virtual bool RecreatewxLuaState(wxEvtHandler *wxlStateEvtHandler, int win_id);
***************
*** 217,222 ****
  enum wxLuaIDE_Styles
  {
!     WXLUAIDE_TB_FILE = 0x0001,
!     WXLUAIDE_TB_LUA  = 0x0002,
      WXLUAIDE_TOOLBAR = WXLUAIDE_TB_FILE|WXLUAIDE_TB_LUA,
      WXLUAIDE_DEFAULT = WXLUAIDE_TOOLBAR
--- 217,222 ----
  enum wxLuaIDE_Styles
  {
!     WXLUAIDE_TB_FILE = 0x0001, // Add Open/Save items in PopulateToolBar
!     WXLUAIDE_TB_LUA  = 0x0002, // Add Run/Stop/Stack Dlg in PopulateToolBar
      WXLUAIDE_TOOLBAR = WXLUAIDE_TB_FILE|WXLUAIDE_TB_LUA,
      WXLUAIDE_DEFAULT = WXLUAIDE_TOOLBAR
***************
*** 284,288 ****
      void SetToolBar(wxToolBar *toolbar);
      wxToolBar *GetToolBar() const { return m_editorOptions.GetToolBar(); } // may be NULL
!     // add our own tools to the toolbar
      void PopulateToolBar(wxToolBar *toolBar, long options = WXLUAIDE_TOOLBAR) const;
      // create a "new" wxMenu to add to the menubar and popupmenu
--- 284,288 ----
      void SetToolBar(wxToolBar *toolbar);
      wxToolBar *GetToolBar() const { return m_editorOptions.GetToolBar(); } // may be NULL
!     // add our own tools to the toolbar, see WXLUAIDE_TB_FILE, WXLUAIDE_TB_LUA
      void PopulateToolBar(wxToolBar *toolBar, long options = WXLUAIDE_TOOLBAR) const;
      // create a "new" wxMenu to add to the menubar and popupmenu

Index: wxluaedit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wxluaedit.cpp	14 Jun 2007 23:59:41 -0000	1.34
--- wxluaedit.cpp	30 Jun 2007 00:12:17 -0000	1.35
***************
*** 438,457 ****
      m_sideNotebook = new wxNotebook(m_sideSplitter, wxID_ANY);
  
! #if wxCHECK_STE_VERSION(1,2,2)
!     #if wxCHECK_STE_VERSION(1,2,3)
!         m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILE_TREECTRL,
!                                         wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT );
!     #else
!         m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILETREECTRL,
!                                         wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT );
!     #endif
      m_fileTreeCtrl->SetIndent(5);
      m_fileTreeCtrl->AddRoot(wxT("Files"));
      m_sideNotebook->AddPage(m_fileTreeCtrl, wxT("Files"));
- #else
-     m_fileListBox = new wxListBox(m_sideNotebook, ID_STF_FILELISTBOX,
-                                   wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE );
-     m_sideNotebook->AddPage(m_fileListBox, wxT("Files"));
- #endif
  
      m_sideSplitterWin1 = m_sideNotebook;
--- 438,446 ----
      m_sideNotebook = new wxNotebook(m_sideSplitter, wxID_ANY);
  
!     m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILE_TREECTRL,
!                                     wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT );
      m_fileTreeCtrl->SetIndent(5);
      m_fileTreeCtrl->AddRoot(wxT("Files"));
      m_sideNotebook->AddPage(m_fileTreeCtrl, wxT("Files"));
  
      m_sideSplitterWin1 = m_sideNotebook;
***************
*** 466,470 ****
      shell->AppendText(wxT("Welcome to the wxLuaShell, an interactive lua interpreter.\n"));
      shell->AppendText(wxT("  Enter lua code and press <enter> to run it.\n"));
!     shell->AppendText(wxT("  Multiline code can be typed by pressing <shift>-<enter>.\n"));
      shell->AppendText(wxT("  The wxLua intrepreter can be restarted with the command 'reset'.\n"));
      shell->MarkerDeleteAll(wxSTEditorShell::markerPrompt);
--- 455,459 ----
      shell->AppendText(wxT("Welcome to the wxLuaShell, an interactive lua interpreter.\n"));
      shell->AppendText(wxT("  Enter lua code and press <enter> to run it.\n"));
!     shell->AppendText(wxT("  Multiline code can be typed by pressing <shift>+<enter>.\n"));
      shell->AppendText(wxT("  The wxLua intrepreter can be restarted with the command 'reset'.\n"));
      shell->MarkerDeleteAll(wxSTEditorShell::markerPrompt);