This commit includes the following changes:
1. I have grabbed a new copy of the original Scintilla code from its CVS repository on SourceForge. I believe this code corresponds to Scintilla 1.24. 2. That code included several new files (stc/scintilla/src/Lex*.cxx) 3. I added mentions of those files to Makefile.in and the .dsp file. 4. I added a new required method to PlatWX.cpp, but it doesn't do anything, and I don't think it needs to. 5. I added code to stc.cpp which gratuitously references all of the lexers, to prevent them from being optimized away by the linker. 6. I modified (stc/scintilla/src/Lex*.cxx) to make the LexerModule objects externally visible. Gripes to me. (eric@sourcegear.com) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
// Robin Dunn <robin@aldunn.com>
|
||||
// The License.txt file describes the conditions under which this software may be distributed.
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
#include "Platform.h"
|
||||
#include "wx/stc/stc.h"
|
||||
@@ -181,7 +182,14 @@ void Surface::BrushColor(Colour back) {
|
||||
}
|
||||
|
||||
void Surface::SetFont(Font &font_) {
|
||||
hdc->SetFont(*font_.GetID());
|
||||
|
||||
// I think the following check is valid.
|
||||
// It eliminates a crash for me. -- eric@sourcegear.com
|
||||
|
||||
if (font_.GetID())
|
||||
{
|
||||
hdc->SetFont(*font_.GetID());
|
||||
}
|
||||
}
|
||||
|
||||
int Surface::LogPixelsY() {
|
||||
@@ -344,7 +352,11 @@ void Surface::SetClip(PRectangle rc) {
|
||||
hdc->SetClippingRegion(wxRectFromPRectangle(rc));
|
||||
}
|
||||
|
||||
|
||||
void Surface::FlushCachedState() {
|
||||
// TODO Is there anything we need to do here? eric@sourcegear.com
|
||||
// TODO I had to add this method when I merged new Scintilla code
|
||||
// TODO from Neil.
|
||||
}
|
||||
|
||||
Window::~Window() {
|
||||
}
|
||||
|
Reference in New Issue
Block a user