diff options
| author | nyamatongwe <unknown> | 2003-03-28 09:54:12 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2003-03-28 09:54:12 +0000 |
| commit | b5ba668e82bfddfbe3934f8f87d1ad1c3c01b17c (patch) | |
| tree | c55618ac5c530218e678edc3e16911c2cbcdf523 | |
| parent | fdf91cc177914e1eae1335214c89c581416dc675 (diff) | |
| download | scintilla-mirror-b5ba668e82bfddfbe3934f8f87d1ad1c3c01b17c.tar.gz | |
Patch from Stephan to allow building without threads and on GTK+ 1.x.
| -rw-r--r-- | gtk/PlatGTK.cxx | 6 | ||||
| -rw-r--r-- | gtk/makefile | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 9585d4138..b8af29fbf 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -758,9 +758,9 @@ bool SurfaceImpl::Initialised() { #endif void SurfaceImpl::Init(WindowID WID_NAME) { - PLATFORM_ASSERT(wid); Release(); #ifdef USE_PANGO + PLATFORM_ASSERT(wid); pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); layout = pango_layout_new(pcontext); @@ -770,11 +770,11 @@ void SurfaceImpl::Init(WindowID WID_NAME) { } void SurfaceImpl::Init(SurfaceID sid, WindowID WID_NAME) { - PLATFORM_ASSERT(wid); PLATFORM_ASSERT(sid); GdkDrawable *drawable_ = reinterpret_cast<GdkDrawable *>(sid); Release(); #ifdef USE_PANGO + PLATFORM_ASSERT(wid); pcontext = gtk_widget_create_pango_context(PWidget(wid)); layout = pango_layout_new(pcontext); #endif @@ -785,12 +785,12 @@ void SurfaceImpl::Init(SurfaceID sid, WindowID WID_NAME) { } void SurfaceImpl::InitPixMap(int width, int height, Surface *surface_, WindowID WID_NAME) { - PLATFORM_ASSERT(wid); PLATFORM_ASSERT(surface_); Release(); SurfaceImpl *surfImpl = static_cast<SurfaceImpl *>(surface_); PLATFORM_ASSERT(surfImpl->drawable); #ifdef USE_PANGO + PLATFORM_ASSERT(wid); pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); layout = pango_layout_new(pcontext); diff --git a/gtk/makefile b/gtk/makefile index 19e64ca9e..2cd2d5262 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -24,10 +24,16 @@ vpath %.cxx ../src INCLUDEDIRS=-I ../include -I ../src CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER $(INCLUDEDIRS) +ifdef NOTHREADS +THREADFLAGS=-DG_THREADS_IMPL_NONE +else +THREADFLAGS= +endif + ifdef DEBUG -CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) +CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) else -CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) +CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) endif ifdef GTK2 @@ -45,7 +51,7 @@ LEXOBJS=\ LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \ LexCrontab.o LexCSS.o LexEiffel.o LexFortran.o LexHTML.o LexLisp.o LexLua.o \ LexMatlab.o LexOthers.o LexPascal.o LexPerl.o LexPOV.o LexPython.o LexRuby.o \ -LexSQL.o LexVB.o +LexSQL.o LexVB.o #--Autogenerated -- end of automatically generated section # The LEXOBJS have to be treated specially as the functions in them are not called from external code |