From b332090aca2ae0efd37292468358c233a02eba44 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 28 Dec 1998 11:39:06 +0000 Subject: [PATCH] Now even Julian can use wxGTK :-) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/makefile.unx | 218 +++++++++++++++++++++++++++++++++++++++++ src/gtk/threadpsx.cpp | 30 +++--- src/gtk1/makefile.unx | 218 +++++++++++++++++++++++++++++++++++++++++ src/gtk1/threadpsx.cpp | 30 +++--- src/make.env | 2 +- src/makeprog.env | 4 +- 6 files changed, 469 insertions(+), 33 deletions(-) create mode 100644 src/gtk/makefile.unx create mode 100644 src/gtk1/makefile.unx diff --git a/src/gtk/makefile.unx b/src/gtk/makefile.unx new file mode 100644 index 0000000000..ae5fd90f3c --- /dev/null +++ b/src/gtk/makefile.unx @@ -0,0 +1,218 @@ +# +# File: makefile.unx +# Author: Robert Roebling +# Created: 1998 +# Updated: +# Copyright: (c) 1998 +# +# +# Makefile for wxGtk library, Unix + +EXTRACFLAGS=-DLEX_SCANNER + +include ../make.env + +LIB_CPP_SRC=\ +\ + ../common/cmndata.cpp \ + ../common/config.cpp \ + ../common/date.cpp \ + ../common/docmdi.cpp \ + ../common/docview.cpp \ + ../common/dynarray.cpp \ + ../common/dynlib.cpp \ + ../common/event.cpp \ + ../common/file.cpp \ + ../common/fileconf.cpp \ + ../common/filefn.cpp \ + ../common/gdicmn.cpp \ + ../common/hash.cpp \ + ../common/helpbase.cpp \ + ../common/intl.cpp \ + ../common/image.cpp \ + ../common/ipcbase.cpp \ + ../common/layout.cpp \ + ../common/list.cpp \ + ../common/log.cpp \ + ../common/matrix.cpp \ + ../common/memory.cpp \ + ../common/module.cpp \ + ../common/object.cpp \ + ../common/odbc.cpp \ + ../common/postscrp.cpp \ + ../common/prntbase.cpp \ + ../common/resource.cpp \ + ../common/serbase.cpp \ + ../common/string.cpp \ + ../common/textfile.cpp \ + ../common/time.cpp \ + ../common/timercmn.cpp \ + ../common/utilscmn.cpp \ + ../common/wincmn.cpp \ + ../common/framecmn.cpp \ + ../common/stream.cpp \ + ../common/datstrm.cpp \ + ../common/wfstream.cpp \ + ../common/mstream.cpp \ + ../common/zstream.cpp \ + ../common/objstrm.cpp \ + ../common/sckstrm.cpp \ + ../common/validate.cpp \ + ../common/valtext.cpp \ + ../common/variant.cpp \ + ../common/wxexpr.cpp \ + ../common/socket.cpp \ + ../common/sckaddr.cpp \ + ../common/sckipc.cpp \ + ../common/protocol.cpp \ + ../common/ftp.cpp \ + ../common/http.cpp \ + ../common/url.cpp \ + ../common/tokenzr.cpp \ +\ + accel.cpp \ + app.cpp \ + bitmap.cpp \ + bmpbuttn.cpp \ + brush.cpp \ + button.cpp \ + checkbox.cpp \ + checklst.cpp \ + choice.cpp \ + clipbrd.cpp \ + colour.cpp \ + control.cpp \ + combobox.cpp \ + cursor.cpp \ + data.cpp \ + dataobj.cpp \ + dc.cpp \ + dcclient.cpp \ + dcmemory.cpp \ + dcscreen.cpp \ + dcps.cpp \ + dialog.cpp \ + dnd.cpp \ + filedlg.cpp \ + font.cpp \ + frame.cpp \ + gauge.cpp \ + gdiobj.cpp \ + icon.cpp \ + listbox.cpp \ + main.cpp \ + mdi.cpp \ + menu.cpp \ + minifram.cpp \ + notebook.cpp \ + palette.cpp \ + pen.cpp \ + radiobox.cpp \ + radiobut.cpp \ + region.cpp \ + scrolbar.cpp \ + settings.cpp \ + slider.cpp \ + spinbutt.cpp \ + statbox.cpp \ + statbmp.cpp \ + stattext.cpp \ + tbargtk.cpp \ + threadpsx.cpp \ + textctrl.cpp \ + timer.cpp \ + utilsgtk.cpp \ + utilsres.cpp \ + wave.cpp \ + window.cpp \ +\ + ../generic/choicdgg.cpp \ + ../generic/colrdlgg.cpp \ + ../generic/dirdlgg.cpp \ + ../generic/fontdlgg.cpp \ + ../generic/gridg.cpp \ + ../generic/helpext.cpp \ + ../generic/imaglist.cpp \ + ../generic/listctrl.cpp \ + ../generic/laywin.cpp \ + ../generic/msgdlgg.cpp \ + ../generic/panelg.cpp \ + ../generic/printps.cpp \ + ../generic/prntdlgg.cpp \ + ../generic/sashwin.cpp \ + ../generic/scrolwin.cpp \ + ../generic/splitter.cpp \ + ../generic/statusbr.cpp \ + ../generic/tabg.cpp \ + ../generic/textdlgg.cpp \ + ../generic/treectrl.cpp + + +ZLIB_SRC=\ + ../zlib/adler32.c ../zlib/deflate.c ../zlib/infblock.c\ + ../zlib/inflate.c ../zlib/zutil.c ../zlib/compress.c \ + ../zlib/infcodes.c ../zlib/inftrees.c ../zlib/trees.c \ + ../zlib/crc32.c ../zlib/gzio.c ../zlib/inffast.c\ + ../zlib/infutil.c ../zlib/uncompr.c + +PNG_SRC=\ + ../png/png.c \ + ../png/pngset.c \ + ../png/pngget.c \ + ../png/pngrutil.c \ + ../png/pngtrans.c \ + ../png/pngwutil.c \ + ../png/pngread.c \ + ../png/pngrio.c \ + ../png/pngwio.c \ + ../png/pngwrite.c \ + ../png/pngrtran.c \ + ../png/pngwtran.c \ + ../png/pngmem.c \ + ../png/pngerror.c \ + ../png/pngpread.c + +LIB_C_SRC=\ +\ + win_gtk.c \ + ../common/y_tab.c \ + ../common/extended.c + +# Only need to compile zlib files if we don't +# already have a zlib library installed on our system +# (or we wish to statically link them for some reason) +EXTRA_C_SRC=\ + $(ZLIB_SRC) $(PNG_SRC) + +all: $(WXLIB) + +# Define library objects +OBJECTS=\ + $(LIB_CPP_SRC:.cpp=.o) $(LIB_C_SRC:.c=.o) $(EXTRA_C_SRC:.c=.o) + +$(WXLIB) : $(OBJECTS) + ar $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ + +../common/y_tab.$(OBJSUFF): ../common/y_tab.c ../common/lex_yy.c + $(CCLEX) -c $(CFLAGS) -DNO_CONFIGURE -o $@ ../common/y_tab.c + +# Replace lex with flex if you run into compilation +# problems with lex_yy.c. See also note about LEX_SCANNER +# above. +../common/lex_yy.c: ../common/lexer.l + $(LEX) -o../common/lex.yy.c ../common/lexer.l + sed -e "s/BUFSIZ/5000/g" < ../common/lex.yy.c | \ + sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \ + sed -e "s/YYLMAX 200/YYLMAX 5000/g" > ../common/lex_yy.c + /bin/rm -f ../common/lex.yy.c + +# Replace yacc with bison if you run into compilation +# problems with y_tab.c. +../common/y_tab.c: ../common/parser.y + $(YACC) ../common/parser.y + mv y.tab.c ../common/y_tab.c + +clean: + rm -f $(OBJECTS) $(WXLIB) + diff --git a/src/gtk/threadpsx.cpp b/src/gtk/threadpsx.cpp index af1b1482cb..224a3a15b8 100644 --- a/src/gtk/threadpsx.cpp +++ b/src/gtk/threadpsx.cpp @@ -80,10 +80,10 @@ wxMutexError wxMutex::Lock() err = pthread_mutex_lock(&(p_internal->p_mutex)); if (err == EDEADLK) - return MUTEX_DEAD_LOCK; + return wxMUTEX_DEAD_LOCK; m_locked++; - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } wxMutexError wxMutex::TryLock() @@ -91,15 +91,15 @@ wxMutexError wxMutex::TryLock() int err; if (m_locked) - return MUTEX_BUSY; + return wxMUTEX_BUSY; err = pthread_mutex_trylock(&(p_internal->p_mutex)); switch (err) { - case EBUSY: return MUTEX_BUSY; + case EBUSY: return wxMUTEX_BUSY; } m_locked++; - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } wxMutexError wxMutex::Unlock() @@ -107,10 +107,10 @@ wxMutexError wxMutex::Unlock() if (m_locked > 0) m_locked--; else - return MUTEX_UNLOCKED; + return wxMUTEX_UNLOCKED; pthread_mutex_unlock(&(p_internal->p_mutex)); - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } //-------------------------------------------------------------------- @@ -195,7 +195,7 @@ wxThreadError wxThread::Create() struct sched_param sp; if (p_internal->state != STATE_IDLE) - return THREAD_RUNNING; + return wxTHREAD_RUNNING; // Change thread priority pthread_attr_init(&a); @@ -216,11 +216,11 @@ wxThreadError wxThread::Create() { p_internal->state = STATE_IDLE; pthread_attr_destroy(&a); - return THREAD_NO_RESOURCE; + return wxTHREAD_NO_RESOURCE; } pthread_attr_destroy(&a); - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } void wxThread::SetPriority(int prio) @@ -259,19 +259,19 @@ wxThreadError wxThread::Destroy() p_internal->state = STATE_CANCELED; } - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Pause() { if (p_internal->state != STATE_RUNNING) - return THREAD_NOT_RUNNING; + return wxTHREAD_NOT_RUNNING; if (!p_internal->defer_destroy) - return THREAD_MISC_ERROR; + return wxTHREAD_MISC_ERROR; p_internal->state = STATE_PAUSING; - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Resume() @@ -279,7 +279,7 @@ wxThreadError wxThread::Resume() if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED) p_internal->state = STATE_RUNNING; - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } void *wxThread::Join() diff --git a/src/gtk1/makefile.unx b/src/gtk1/makefile.unx new file mode 100644 index 0000000000..ae5fd90f3c --- /dev/null +++ b/src/gtk1/makefile.unx @@ -0,0 +1,218 @@ +# +# File: makefile.unx +# Author: Robert Roebling +# Created: 1998 +# Updated: +# Copyright: (c) 1998 +# +# +# Makefile for wxGtk library, Unix + +EXTRACFLAGS=-DLEX_SCANNER + +include ../make.env + +LIB_CPP_SRC=\ +\ + ../common/cmndata.cpp \ + ../common/config.cpp \ + ../common/date.cpp \ + ../common/docmdi.cpp \ + ../common/docview.cpp \ + ../common/dynarray.cpp \ + ../common/dynlib.cpp \ + ../common/event.cpp \ + ../common/file.cpp \ + ../common/fileconf.cpp \ + ../common/filefn.cpp \ + ../common/gdicmn.cpp \ + ../common/hash.cpp \ + ../common/helpbase.cpp \ + ../common/intl.cpp \ + ../common/image.cpp \ + ../common/ipcbase.cpp \ + ../common/layout.cpp \ + ../common/list.cpp \ + ../common/log.cpp \ + ../common/matrix.cpp \ + ../common/memory.cpp \ + ../common/module.cpp \ + ../common/object.cpp \ + ../common/odbc.cpp \ + ../common/postscrp.cpp \ + ../common/prntbase.cpp \ + ../common/resource.cpp \ + ../common/serbase.cpp \ + ../common/string.cpp \ + ../common/textfile.cpp \ + ../common/time.cpp \ + ../common/timercmn.cpp \ + ../common/utilscmn.cpp \ + ../common/wincmn.cpp \ + ../common/framecmn.cpp \ + ../common/stream.cpp \ + ../common/datstrm.cpp \ + ../common/wfstream.cpp \ + ../common/mstream.cpp \ + ../common/zstream.cpp \ + ../common/objstrm.cpp \ + ../common/sckstrm.cpp \ + ../common/validate.cpp \ + ../common/valtext.cpp \ + ../common/variant.cpp \ + ../common/wxexpr.cpp \ + ../common/socket.cpp \ + ../common/sckaddr.cpp \ + ../common/sckipc.cpp \ + ../common/protocol.cpp \ + ../common/ftp.cpp \ + ../common/http.cpp \ + ../common/url.cpp \ + ../common/tokenzr.cpp \ +\ + accel.cpp \ + app.cpp \ + bitmap.cpp \ + bmpbuttn.cpp \ + brush.cpp \ + button.cpp \ + checkbox.cpp \ + checklst.cpp \ + choice.cpp \ + clipbrd.cpp \ + colour.cpp \ + control.cpp \ + combobox.cpp \ + cursor.cpp \ + data.cpp \ + dataobj.cpp \ + dc.cpp \ + dcclient.cpp \ + dcmemory.cpp \ + dcscreen.cpp \ + dcps.cpp \ + dialog.cpp \ + dnd.cpp \ + filedlg.cpp \ + font.cpp \ + frame.cpp \ + gauge.cpp \ + gdiobj.cpp \ + icon.cpp \ + listbox.cpp \ + main.cpp \ + mdi.cpp \ + menu.cpp \ + minifram.cpp \ + notebook.cpp \ + palette.cpp \ + pen.cpp \ + radiobox.cpp \ + radiobut.cpp \ + region.cpp \ + scrolbar.cpp \ + settings.cpp \ + slider.cpp \ + spinbutt.cpp \ + statbox.cpp \ + statbmp.cpp \ + stattext.cpp \ + tbargtk.cpp \ + threadpsx.cpp \ + textctrl.cpp \ + timer.cpp \ + utilsgtk.cpp \ + utilsres.cpp \ + wave.cpp \ + window.cpp \ +\ + ../generic/choicdgg.cpp \ + ../generic/colrdlgg.cpp \ + ../generic/dirdlgg.cpp \ + ../generic/fontdlgg.cpp \ + ../generic/gridg.cpp \ + ../generic/helpext.cpp \ + ../generic/imaglist.cpp \ + ../generic/listctrl.cpp \ + ../generic/laywin.cpp \ + ../generic/msgdlgg.cpp \ + ../generic/panelg.cpp \ + ../generic/printps.cpp \ + ../generic/prntdlgg.cpp \ + ../generic/sashwin.cpp \ + ../generic/scrolwin.cpp \ + ../generic/splitter.cpp \ + ../generic/statusbr.cpp \ + ../generic/tabg.cpp \ + ../generic/textdlgg.cpp \ + ../generic/treectrl.cpp + + +ZLIB_SRC=\ + ../zlib/adler32.c ../zlib/deflate.c ../zlib/infblock.c\ + ../zlib/inflate.c ../zlib/zutil.c ../zlib/compress.c \ + ../zlib/infcodes.c ../zlib/inftrees.c ../zlib/trees.c \ + ../zlib/crc32.c ../zlib/gzio.c ../zlib/inffast.c\ + ../zlib/infutil.c ../zlib/uncompr.c + +PNG_SRC=\ + ../png/png.c \ + ../png/pngset.c \ + ../png/pngget.c \ + ../png/pngrutil.c \ + ../png/pngtrans.c \ + ../png/pngwutil.c \ + ../png/pngread.c \ + ../png/pngrio.c \ + ../png/pngwio.c \ + ../png/pngwrite.c \ + ../png/pngrtran.c \ + ../png/pngwtran.c \ + ../png/pngmem.c \ + ../png/pngerror.c \ + ../png/pngpread.c + +LIB_C_SRC=\ +\ + win_gtk.c \ + ../common/y_tab.c \ + ../common/extended.c + +# Only need to compile zlib files if we don't +# already have a zlib library installed on our system +# (or we wish to statically link them for some reason) +EXTRA_C_SRC=\ + $(ZLIB_SRC) $(PNG_SRC) + +all: $(WXLIB) + +# Define library objects +OBJECTS=\ + $(LIB_CPP_SRC:.cpp=.o) $(LIB_C_SRC:.c=.o) $(EXTRA_C_SRC:.c=.o) + +$(WXLIB) : $(OBJECTS) + ar $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ + +../common/y_tab.$(OBJSUFF): ../common/y_tab.c ../common/lex_yy.c + $(CCLEX) -c $(CFLAGS) -DNO_CONFIGURE -o $@ ../common/y_tab.c + +# Replace lex with flex if you run into compilation +# problems with lex_yy.c. See also note about LEX_SCANNER +# above. +../common/lex_yy.c: ../common/lexer.l + $(LEX) -o../common/lex.yy.c ../common/lexer.l + sed -e "s/BUFSIZ/5000/g" < ../common/lex.yy.c | \ + sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \ + sed -e "s/YYLMAX 200/YYLMAX 5000/g" > ../common/lex_yy.c + /bin/rm -f ../common/lex.yy.c + +# Replace yacc with bison if you run into compilation +# problems with y_tab.c. +../common/y_tab.c: ../common/parser.y + $(YACC) ../common/parser.y + mv y.tab.c ../common/y_tab.c + +clean: + rm -f $(OBJECTS) $(WXLIB) + diff --git a/src/gtk1/threadpsx.cpp b/src/gtk1/threadpsx.cpp index af1b1482cb..224a3a15b8 100644 --- a/src/gtk1/threadpsx.cpp +++ b/src/gtk1/threadpsx.cpp @@ -80,10 +80,10 @@ wxMutexError wxMutex::Lock() err = pthread_mutex_lock(&(p_internal->p_mutex)); if (err == EDEADLK) - return MUTEX_DEAD_LOCK; + return wxMUTEX_DEAD_LOCK; m_locked++; - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } wxMutexError wxMutex::TryLock() @@ -91,15 +91,15 @@ wxMutexError wxMutex::TryLock() int err; if (m_locked) - return MUTEX_BUSY; + return wxMUTEX_BUSY; err = pthread_mutex_trylock(&(p_internal->p_mutex)); switch (err) { - case EBUSY: return MUTEX_BUSY; + case EBUSY: return wxMUTEX_BUSY; } m_locked++; - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } wxMutexError wxMutex::Unlock() @@ -107,10 +107,10 @@ wxMutexError wxMutex::Unlock() if (m_locked > 0) m_locked--; else - return MUTEX_UNLOCKED; + return wxMUTEX_UNLOCKED; pthread_mutex_unlock(&(p_internal->p_mutex)); - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } //-------------------------------------------------------------------- @@ -195,7 +195,7 @@ wxThreadError wxThread::Create() struct sched_param sp; if (p_internal->state != STATE_IDLE) - return THREAD_RUNNING; + return wxTHREAD_RUNNING; // Change thread priority pthread_attr_init(&a); @@ -216,11 +216,11 @@ wxThreadError wxThread::Create() { p_internal->state = STATE_IDLE; pthread_attr_destroy(&a); - return THREAD_NO_RESOURCE; + return wxTHREAD_NO_RESOURCE; } pthread_attr_destroy(&a); - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } void wxThread::SetPriority(int prio) @@ -259,19 +259,19 @@ wxThreadError wxThread::Destroy() p_internal->state = STATE_CANCELED; } - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Pause() { if (p_internal->state != STATE_RUNNING) - return THREAD_NOT_RUNNING; + return wxTHREAD_NOT_RUNNING; if (!p_internal->defer_destroy) - return THREAD_MISC_ERROR; + return wxTHREAD_MISC_ERROR; p_internal->state = STATE_PAUSING; - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Resume() @@ -279,7 +279,7 @@ wxThreadError wxThread::Resume() if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED) p_internal->state = STATE_RUNNING; - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } void *wxThread::Join() diff --git a/src/make.env b/src/make.env index 9d4e2aec27..b47aa8787d 100644 --- a/src/make.env +++ b/src/make.env @@ -104,7 +104,7 @@ motif: make -f makefile.unx all GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm' gtk: - make -f makefile.unx all GUI='-D__WXGTK__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk $(COMPLIBS) -lXm -lXmu -lXpm -lX11 -lm' + make -f makefile.unx all GUI='-D__WXGTK__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lX11 -lm -pthread' cleanstubs: make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' diff --git a/src/makeprog.env b/src/makeprog.env index 49b5de907f..aea563b7df 100644 --- a/src/makeprog.env +++ b/src/makeprog.env @@ -1,6 +1,6 @@ # Replace this with your own path if necessary -#WXDIR = /home/karl/wxWindows -WXDIR = /home/jacs/wx2 +WXDIR = $(WXWIN) +#WXDIR = /home/jacs/wx2 include $(WXDIR)/src/make.env all: $(PROGRAM)$(GUISUFFIX) -- 2.47.2