[Wxlua-commit] wxLua/apps/wxluaedit/src wxledit.cpp,1.37,1.38

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

Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31525/apps/wxluaedit/src

Modified Files:
	wxledit.cpp 
Log Message:
Fix signature of wxLuaBinding_XXX_init() in cansim.cpp
Update wxledit.cpp for cvs version of wxStEdit in wxCode


Index: wxledit.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** wxledit.cpp	5 Dec 2008 21:15:11 -0000	1.37
--- wxledit.cpp	12 Aug 2010 23:40:33 -0000	1.38
***************
*** 65,70 ****
          return false;
  
!     SetFileName(name, false);
!     SetLanguage(wxT("a.lua")); // use the lua lexer
  
      return true;
--- 65,70 ----
          return false;
  
!     SetFileName(wxFileName(name), false);
!     SetLanguage(wxFileName(wxT("a.lua"))); // use the lua lexer
  
      return true;
***************
*** 284,289 ****
      //SetMarginMask(marginError, (1<<markerError)|(1<<markerBreak)|(1<<STE_BOOKMARK_MARKER));
  
!     SetFileName(wxT("untitled.lua"));
!     SetLanguage(wxT("untitled.lua"));
      return true;
  }
--- 284,289 ----
      //SetMarginMask(marginError, (1<<markerError)|(1<<markerBreak)|(1<<STE_BOOKMARK_MARKER));
  
!     SetFileName(wxFileName(wxT("untitled.lua")));
!     SetLanguage(wxFileName(wxT("untitled.lua")));
      return true;
  }
***************
*** 479,483 ****
      m_luaOutput->SetwxLuaState(m_wxlState, true);
      m_luaOutput->SetWrapMode(wxSTC_WRAP_NONE);
!     m_luaOutput->SetFileName(wxT("Output"));
  
  
--- 479,483 ----
      m_luaOutput->SetwxLuaState(m_wxlState, true);
      m_luaOutput->SetWrapMode(wxSTC_WRAP_NONE);
!     m_luaOutput->SetFileName(wxFileName(wxT("Output")));
  
  
***************
*** 666,675 ****
          case ID_WXLUAIDE_LOAD_LUA :
          {
!             wxString filename = editor->GetFileName();
!             wxString path;
  
!             if (!filename.IsEmpty())
              {
-                 wxFileName fn(filename);
                  path = fn.GetPath();
                  filename = fn.GetFullName();
--- 666,674 ----
          case ID_WXLUAIDE_LOAD_LUA :
          {
!             wxFileName fn = editor->GetFileName();
!             wxString filename, path;
  
!             if (fn.IsOk())
              {
                  path = fn.GetPath();
                  filename = fn.GetFullName();
***************
*** 727,731 ****
              wxSafeYield(); // allow tools to adjust (sometimes necessary?)
  
!             if (!editor->GetFileName().IsEmpty())
              {
                  wxFileName fn(editor->GetFileName());
--- 726,730 ----
              wxSafeYield(); // allow tools to adjust (sometimes necessary?)
  
!             if (editor->GetFileName().IsOk())
              {
                  wxFileName fn(editor->GetFileName());