--- contrib/src/stc/scintilla/src/ScintillaBase.cxx.orig Tue Sep 16 22:29:31 2003 +++ contrib/src/stc/scintilla/src/ScintillaBase.cxx Tue Sep 16 22:32:16 2003 @@ -10,6 +10,7 @@ #include #include +#include "wx/stc/stc.h" #include "Platform.h" #include "Scintilla.h" @@ -379,15 +380,15 @@ if (displayPopupMenu) { bool writable = !WndProc(SCI_GETREADONLY, 0, 0); popup.CreatePopUp(); - AddToPopUp("Undo", idcmdUndo, writable && pdoc->CanUndo()); - AddToPopUp("Redo", idcmdRedo, writable && pdoc->CanRedo()); - AddToPopUp(""); - AddToPopUp("Cut", idcmdCut, writable && currentPos != anchor); - AddToPopUp("Copy", idcmdCopy, currentPos != anchor); - AddToPopUp("Paste", idcmdPaste, writable && WndProc(SCI_CANPASTE, 0, 0)); - AddToPopUp("Delete", idcmdDelete, writable && currentPos != anchor); - AddToPopUp(""); - AddToPopUp("Select All", idcmdSelectAll); + AddToPopUp(_("&Undo\tCtrl-Z"), idcmdUndo, writable && pdoc->CanUndo()); + AddToPopUp(_("&Redo\tCtrl-Y"), idcmdRedo, writable && pdoc->CanRedo()); + AddToPopUp(_("")); + AddToPopUp(_("Cu&t\tCtrl-X"), idcmdCut, writable && currentPos != anchor); + AddToPopUp(_("&Copy\tCtrl-C"), idcmdCopy, currentPos != anchor); + AddToPopUp(_("&Paste\tCtrl-V"), idcmdPaste, writable && WndProc(SCI_CANPASTE, 0, 0)); + AddToPopUp(_("&Delete"), idcmdDelete, writable && currentPos != anchor); + AddToPopUp(_("")); + AddToPopUp(_("Select &All"), idcmdSelectAll); popup.Show(pt, wMain); } } --- contrib/src/stc/scintilla/src/ScintillaBase.h.orig Tue Sep 16 22:53:19 2003 +++ contrib/src/stc/scintilla/src/ScintillaBase.h Tue Sep 16 22:54:02 2003 @@ -75,7 +75,7 @@ void CallTipShow(Point pt, const char *defn); virtual void CreateCallTipWindow(PRectangle rc) = 0; - virtual void AddToPopUp(const char *label, int cmd=0, bool enabled=true) = 0; + virtual void AddToPopUp(const wxString &label, int cmd=0, bool enabled=true) = 0; void ContextMenu(Point pt); virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt); --- contrib/src/stc/ScintillaWX.cpp.orig Tue Sep 16 22:27:32 2003 +++ contrib/src/stc/ScintillaWX.cpp Tue Sep 16 22:52:07 2003 @@ -398,11 +398,11 @@ } -void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) { +void ScintillaWX::AddToPopUp(const wxString &label, int cmd, bool enabled) { if (!label[0]) ((wxMenu*)popup.GetID())->AppendSeparator(); else - ((wxMenu*)popup.GetID())->Append(cmd, stc2wx(label)); + ((wxMenu*)popup.GetID())->Append(cmd, label); if (!enabled) ((wxMenu*)popup.GetID())->Enable(cmd, enabled); --- contrib/src/stc/ScintillaWX.h.orig Tue Sep 16 22:28:24 2003 +++ contrib/src/stc/ScintillaWX.h Tue Sep 16 22:29:02 2003 @@ -101,7 +101,7 @@ virtual void Copy(); virtual void Paste(); virtual void CreateCallTipWindow(PRectangle rc); - virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); + virtual void AddToPopUp(const wxString &label, int cmd = 0, bool enabled = true); virtual void ClaimSelection(); virtual long DefWndProc(unsigned int iMessage, --- contrib/src/stc/StcVC.dsp.orig Tue Sep 16 22:34:27 2003 +++ contrib/src/stc/StcVC.dsp Tue Sep 16 23:12:24 2003 @@ -22,6 +22,10 @@ !MESSAGE "stcVC - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "stcVC - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "stcVC - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "stcVC - Win32 UNICODE Release" (based on "Win32 (x86) Static Library") +!MESSAGE "stcVC - Win32 UNICODE Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "stcVC - Win32 UNICODE Debug DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "stcVC - Win32 UNICODE Release DLL" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -149,6 +153,126 @@ # ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/stcdll.dll" /libpath:"../../../lib" # SUBTRACT LINK32 /pdb:none /incremental:no /debug +!ELSEIF "$(CFG)" == "stcVC - Win32 UNICODE Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +LINK32=link.exe +CPP=cl.exe +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswu" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "_UNICODE" /D "UNICODE" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +RSC=rc.exe +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\..\lib\stc.lib" + +!ELSEIF "$(CFG)" == "stcVC - Win32 UNICODE Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +LINK32=link.exe +CPP=cl.exe +# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswud" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "_UNICODE" /D "UNICODE" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +RSC=rc.exe +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib" + +!ELSEIF "$(CFG)" == "stcVC - Win32 UNICODE Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug_DLL" +# PROP BASE Intermediate_Dir "Debug_DLL" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\lib" +# PROP Intermediate_Dir "Debug_DLL" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +# ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswud" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "_UNICODE" /D "UNICODE" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_STC_DLL" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +# SUBTRACT CPP /u +MTL=midl.exe +RSC=rc.exe +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /machine:IX86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "stcVC - Win32 UNICODE Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "stcVC___Win32_Release_DLL" +# PROP BASE Intermediate_Dir "stcVC___Win32_Release_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\lib" +# PROP Intermediate_Dir "Release_DLL" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +# ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdllu" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /D "WXBUILD_STC_DLL" /YX /FD /c +# SUBTRACT BASE CPP /u +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdllu" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "_UNICODE" /D "UNICODE" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_STC_DLL" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +# SUBTRACT CPP /u +MTL=midl.exe +RSC=rc.exe +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/stcdll.dll" /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none /incremental:no /debug + !ENDIF # Begin Target @@ -157,6 +281,10 @@ # Name "stcVC - Win32 Debug" # Name "stcVC - Win32 Debug DLL" # Name "stcVC - Win32 Release DLL" +# Name "stcVC - Win32 UNICODE Release" +# Name "stcVC - Win32 UNICODE Debug" +# Name "stcVC - Win32 UNICODE Debug DLL" +# Name "stcVC - Win32 UNICODE Release DLL" # Begin Group "wxStyledTextCtrl Src" # PROP Default_Filter "*.cpp"