[Wxlua-commit] wxLua/apps/wxlua/src wxLua_wx26.dsp,1.2,1.3 wxLua_wx26.dsw,1.3,1.4 wxlua.cpp,1.2,1.3

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

Update of /cvsroot/wxlua/wxLua/apps/wxlua/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/wxLua/apps/wxlua/src

Modified Files:
	wxLua_wx26.dsp wxLua_wx26.dsw wxlua.cpp 
Log Message:
Updated to wxIDE's wrapper files


Index: wxLua_wx26.dsp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxLua_wx26.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxLua_wx26.dsp	7 Jun 2005 19:58:25 -0000	1.2
--- wxLua_wx26.dsp	18 Jun 2005 20:45:46 -0000	1.3
***************
*** 52,57 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows
! # ADD LINK32      /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "wxLua_wx26 - Win32 Debug"
--- 52,57 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxluabind_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows
! # ADD LINK32      /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxluabind_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows
  
  !ELSEIF  "$(CFG)" == "wxLua_wx26 - Win32 Debug"
***************
*** 77,82 ****
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows
! # ADD LINK32      /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows
  
  
--- 77,82 ----
  # ADD BSC32 /nologo
  LINK32=link.exe
! # ADD BASE LINK32 /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxluabindd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows
! # ADD LINK32      /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxluabindd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386  /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows
  
  
***************
*** 90,134 ****
  # Begin Source File
  
- SOURCE=..\..\..\icons\wxlua.ico
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\..\bindings\wxwidgets\override.hpp
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\..\bindings\wxwidgets\wxluawrap.i
- 
- !IF  "$(CFG)" == "wxLua_wx26 - Win32 Release"
- 
- USERDEP__WXLUA="..\..\..\bindings\wxwidgets\override.hpp"        
- # Begin Custom Build - Generating Binding
- 
- "wxLuaWrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-         echo Building wrapper file wxLuaWrap.cpp
- 	wrap.bat
-         
- # End Custom Build
- 
- !ELSEIF  "$(CFG)" == "wxLua_wx26 - Win32 Debug"
- 
- USERDEP__WXLUA="..\..\..\bindings\wxwidgets\override.hpp"        
- # Begin Custom Build - Generating Binding
- 
- "wxLuaWrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-         echo Building wrapper file wxLuaWrap.cpp
- 	wrap.bat
-         
- # End Custom Build
- 
- !ENDIF 
- 
- # End Source File
- # Begin Source File
- 
- SOURCE=.\wxluawrap.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\wxlua.rc
  # End Source File
--- 90,93 ----

Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxlua.cpp	14 Jun 2005 21:44:39 -0000	1.2
--- wxlua.cpp	18 Jun 2005 20:45:46 -0000	1.3
***************
*** 55,59 ****
      virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); }
      virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); }
!     virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_app->SetStackFrame(pStackFrame); }
      virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); }
  
--- 55,59 ----
      virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); }
      virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); }
!     //virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_app->SetStackFrame(pStackFrame); }
      virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); }
  
***************
*** 352,356 ****
--- 352,358 ----
                                                         wxSize(500, 250),
                                                         &li);
+     wxGetApp().SetStackFrame(pStackFrame);
      pStackFrame->ShowModal();
+     wxGetApp().SetStackFrame(NULL);
      pStackFrame->Destroy();
  #endif

Index: wxLua_wx26.dsw
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxLua_wx26.dsw,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxLua_wx26.dsw	7 Jun 2005 20:18:06 -0000	1.3
--- wxLua_wx26.dsw	18 Jun 2005 20:45:46 -0000	1.4
***************
*** 64,67 ****
--- 64,79 ----
  ###############################################################################
  
+ Project: "wxLuaBindLib_wx26"=..\..\..\modules\wxbind\src\wxluabind_wx26.dsp - Package Owner=<4>
+ 
+ Package=<5>
+ {{{
+ }}}
+ 
+ Package=<4>
+ {{{
+ }}}
+ 
+ ###############################################################################
+ 
  Project: "wxLua_wx26"=.\wxLua_wx26.dsp - Package Owner=<4>
  
***************
*** 87,90 ****
--- 99,105 ----
      Project_Dep_Name wxLuaSocketLib_wx26
      End Project Dependency    
+     Begin Project Dependency
+     Project_Dep_Name wxLuaBindLib_wx26
+     End Project Dependency    
  }}}