Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now even Julian can use wxGTK :-)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-28 11:39:06 +00:00
parent bec3e8601d
commit b332090aca
6 changed files with 469 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
src/gtk/makefile.unx Normal file
View File

@@ -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)

30
src/gtk/threadpsx.cpp
View File

@@ -80,10 +80,10 @@ wxMutexError wxMutex::Lock()
err = pthread_mutex_lock(&(p_internal->p_mutex)); err = pthread_mutex_lock(&(p_internal->p_mutex));
if (err == EDEADLK) if (err == EDEADLK)
return MUTEX_DEAD_LOCK; return wxMUTEX_DEAD_LOCK;
m_locked++; m_locked++;
return MUTEX_NO_ERROR; return wxMUTEX_NO_ERROR;
} }
wxMutexError wxMutex::TryLock() wxMutexError wxMutex::TryLock()
@@ -91,15 +91,15 @@ wxMutexError wxMutex::TryLock()
int err; int err;
if (m_locked) if (m_locked)
return MUTEX_BUSY; return wxMUTEX_BUSY;
err = pthread_mutex_trylock(&(p_internal->p_mutex)); err = pthread_mutex_trylock(&(p_internal->p_mutex));
switch (err) switch (err)
{ {
case EBUSY: return MUTEX_BUSY; case EBUSY: return wxMUTEX_BUSY;
} }
m_locked++; m_locked++;
return MUTEX_NO_ERROR; return wxMUTEX_NO_ERROR;
} }
wxMutexError wxMutex::Unlock() wxMutexError wxMutex::Unlock()
@@ -107,10 +107,10 @@ wxMutexError wxMutex::Unlock()
if (m_locked > 0) if (m_locked > 0)
m_locked--; m_locked--;
else else
return MUTEX_UNLOCKED; return wxMUTEX_UNLOCKED;
pthread_mutex_unlock(&(p_internal->p_mutex)); 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; struct sched_param sp;
if (p_internal->state != STATE_IDLE) if (p_internal->state != STATE_IDLE)
return THREAD_RUNNING; return wxTHREAD_RUNNING;
// Change thread priority // Change thread priority
pthread_attr_init(&a); pthread_attr_init(&a);
@@ -216,11 +216,11 @@ wxThreadError wxThread::Create()
{ {
p_internal->state = STATE_IDLE; p_internal->state = STATE_IDLE;
pthread_attr_destroy(&a); pthread_attr_destroy(&a);
return THREAD_NO_RESOURCE; return wxTHREAD_NO_RESOURCE;
} }
pthread_attr_destroy(&a); pthread_attr_destroy(&a);
return THREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
} }
void wxThread::SetPriority(int prio) void wxThread::SetPriority(int prio)
@@ -259,19 +259,19 @@ wxThreadError wxThread::Destroy()
p_internal->state = STATE_CANCELED; p_internal->state = STATE_CANCELED;
} }
return THREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
} }
wxThreadError wxThread::Pause() wxThreadError wxThread::Pause()
{ {
if (p_internal->state != STATE_RUNNING) if (p_internal->state != STATE_RUNNING)
return THREAD_NOT_RUNNING; return wxTHREAD_NOT_RUNNING;
if (!p_internal->defer_destroy) if (!p_internal->defer_destroy)
return THREAD_MISC_ERROR; return wxTHREAD_MISC_ERROR;
p_internal->state = STATE_PAUSING; p_internal->state = STATE_PAUSING;
return THREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
} }
wxThreadError wxThread::Resume() wxThreadError wxThread::Resume()
@@ -279,7 +279,7 @@ wxThreadError wxThread::Resume()
if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED) if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED)
p_internal->state = STATE_RUNNING; p_internal->state = STATE_RUNNING;
return THREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
} }
void *wxThread::Join() void *wxThread::Join()

218
src/gtk1/makefile.unx Normal file
View File

@@ -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)

30
src/gtk1/threadpsx.cpp
View File

@@ -80,10 +80,10 @@ wxMutexError wxMutex::Lock()
err = pthread_mutex_lock(&(p_internal->p_mutex)); err = pthread_mutex_lock(&(p_internal->p_mutex));
if (err == EDEADLK) if (err == EDEADLK)
return MUTEX_DEAD_LOCK; return wxMUTEX_DEAD_LOCK;
m_locked++; m_locked++;
return MUTEX_NO_ERROR; return wxMUTEX_NO_ERROR;
} }
wxMutexError wxMutex::TryLock() wxMutexError wxMutex::TryLock()
@@ -91,15 +91,15 @@ wxMutexError wxMutex::TryLock()
int err; int err;
if (m_locked) if (m_locked)
return MUTEX_BUSY; return wxMUTEX_BUSY;
err = pthread_mutex_trylock(&(p_internal->p_mutex)); err = pthread_mutex_trylock(&(p_internal->p_mutex));
switch (err) switch (err)
{ {
case EBUSY: return MUTEX_BUSY; case EBUSY: return wxMUTEX_BUSY;
} }
m_locked++; m_locked++;
return MUTEX_NO_ERROR; return wxMUTEX_NO_ERROR;
} }
wxMutexError wxMutex::Unlock() wxMutexError wxMutex::Unlock()
@@ -107,10 +107,10 @@ wxMutexError wxMutex::Unlock()
if (m_locked > 0) if (m_locked > 0)
m_locked--; m_locked--;
else else
return MUTEX_UNLOCKED; return wxMUTEX_UNLOCKED;
pthread_mutex_unlock(&(p_internal->p_mutex)); 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; struct sched_param sp;
if (p_internal->state != STATE_IDLE) if (p_internal->state != STATE_IDLE)
return THREAD_RUNNING; return wxTHREAD_RUNNING;
// Change thread priority // Change thread priority
pthread_attr_init(&a); pthread_attr_init(&a);
@@ -216,11 +216,11 @@ wxThreadError wxThread::Create()
{ {
p_internal->state = STATE_IDLE; p_internal->state = STATE_IDLE;
pthread_attr_destroy(&a); pthread_attr_destroy(&a);
return THREAD_NO_RESOURCE; return wxTHREAD_NO_RESOURCE;
} }
pthread_attr_destroy(&a); pthread_attr_destroy(&a);
return THREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
} }
void wxThread::SetPriority(int prio) void wxThread::SetPriority(int prio)
@@ -259,19 +259,19 @@ wxThreadError wxThread::Destroy()
p_internal->state = STATE_CANCELED; p_internal->state = STATE_CANCELED;
} }
return THREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
} }
wxThreadError wxThread::Pause() wxThreadError wxThread::Pause()
{ {
if (p_internal->state != STATE_RUNNING) if (p_internal->state != STATE_RUNNING)
return THREAD_NOT_RUNNING; return wxTHREAD_NOT_RUNNING;
if (!p_internal->defer_destroy) if (!p_internal->defer_destroy)
return THREAD_MISC_ERROR; return wxTHREAD_MISC_ERROR;
p_internal->state = STATE_PAUSING; p_internal->state = STATE_PAUSING;
return THREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
} }
wxThreadError wxThread::Resume() wxThreadError wxThread::Resume()
@@ -279,7 +279,7 @@ wxThreadError wxThread::Resume()
if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED) if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED)
p_internal->state = STATE_RUNNING; p_internal->state = STATE_RUNNING;
return THREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
} }
void *wxThread::Join() void *wxThread::Join()

2
src/make.env
View File

@@ -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' 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: 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: cleanstubs:
make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'

4
src/makeprog.env
View File

@@ -1,6 +1,6 @@
# Replace this with your own path if necessary # Replace this with your own path if necessary
#WXDIR = /home/karl/wxWindows WXDIR = $(WXWIN)
WXDIR = /home/jacs/wx2 #WXDIR = /home/jacs/wx2
include $(WXDIR)/src/make.env include $(WXDIR)/src/make.env
all: $(PROGRAM)$(GUISUFFIX) all: $(PROGRAM)$(GUISUFFIX)