AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile fixes, warnings etc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1998-11-12 16:40:16 +00:00
parent 0133ee9316
commit 7615330240
10 changed files with 371 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

618
configure vendored
View File

File diff suppressed because it is too large Load Diff

29
configure.in
View File

@ -240,6 +240,10 @@ SEARCH_INCLUDE="\
/usr/X11R5/include \
/usr/X11R4/include \
\
/usr/X11R6/lib \
/usr/X11R5/lib \
/usr/X11R4/lib \
\
/usr/include/X11R6 \
/usr/include/X11R5 \
/usr/include/X11R4 \
@ -994,6 +998,8 @@ GUI_TK_INCLUDE=
GUI_TK_LIBRARY=
GUI_TK_LINK=
WX_LINK=
MAKEINCLUDE=
if test "$wxUSE_GTK" = 1; then
@ -1003,6 +1009,7 @@ if test "$wxUSE_GTK" = 1; then
], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4?))
TOOLKIT=GTK
TOOLKIT_DEF=__WXGTK__
WX_LINK=-lwx_gtk
MAKEINCLUDE=../gtk.inc
fi
@ -1025,9 +1032,10 @@ if test "$wxUSE_QT" = 1; then
else
AC_MSG_ERROR(no)
fi
GUI_TK_LINK="-lXext -lX11 -lqt -lm"
GUI_TK_LINK="-lX11 -lqt -lm"
TOOLKIT=QT
TOOLKIT_DEF=__WXQT__
WX_LINK=-lwx_qt
MAKEINCLUDE=../qt.inc
fi
@ -1036,23 +1044,34 @@ if test "$wxUSE_MOTIF" = 1; then
AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,Xm.h)
if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found $ac_find_includes)
AC_MSG_CHECKING(for Motif or Lesstif library)
AC_MSG_CHECKING(for Motif/Lesstif library)
AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xm)
if test "$ac_find_libraries" != "" ; then
AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
CHECK_LINK="$CHECK_LIB $ac_path_to_link"
CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
AC_MSG_RESULT(found at $ac_find_libraries)
AC_MSG_CHECKING(for Xt library)
AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt)
if test "$ac_find_libraries" != "" ; then
AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
CHECK_LINK="$CHECK_LIB $ac_path_to_link"
AC_MSG_RESULT(found at $ac_find_libraries)
else
AC_MSG_ERROR(no)
fi
else
AC_MSG_ERROR(no)
fi
else
AC_MSG_ERROR(no)
fi
GUI_TK_LINK="-lXext -lXt -lX11 -lXm -lm"
GUI_TK_LINK="-lXt -lX11 -lXm -lm"
GUI_TK_LINK="$CHECK_LINK $GUI_TK_LINK"
TOOLKIT=MOTIF
TOOLKIT_DEF=__WXMOTIF__
WX_LINK=-lwx_motif
MAKEINCLUDE=../motif.inc
fi
@ -1064,6 +1083,8 @@ AC_SUBST(GUI_TK_INCLUDE)
AC_SUBST(GUI_TK_LIBRARY)
AC_SUBST(GUI_TK_LINK)
AC_SUBST(WX_LINK)
AC_SUBST(TOOLKIT)
AC_SUBST(TOOLKIT_DEF)

2
include/wx/helpbase.h
View File

@ -32,7 +32,7 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
// Must call this to set the filename and server name.
// server is only required when implementing TCP/IP-based
// help controllers.
virtual bool Initialize(const wxString& file, int server) { return FALSE; };
virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return FALSE; };
virtual bool Initialize(const wxString& file) = 0;
// If file is "", reloads file given in Initialize

4
setup/maketmpl.in
View File

@ -84,6 +84,8 @@ GUI_TK_INCLUDE = @GUI_TK_INCLUDE@
GUI_TK_LIBRARY = @GUI_TK_LIBRARY@
GUI_TK_LINK = @GUI_TK_LINK@
WX_LINK = @WX_LINK@
OPENGL_INCLUDE = @OPENGL_INCLUDE@
OPENGL_LIBRARY = @OPENGL_LIBRARY@
OPENGL_LINK = @OPENGL_LINK@
@ -107,7 +109,7 @@ $(X_CFLAGS)
# -I$(WXBASEDIR)/src/zlib \
# -I$(WXBASEDIR)/src/gdk_imlib \
WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk
WX_LIBS = -L$(GLOBAL_LIB_DIR) $(WX_LINK)
OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)

3
setup/substit.in
View File

@ -36,6 +36,7 @@ s|*X_PRE_LIBS*|@X_PRE_LIBS@|g
s|*GUI_TK_INCLUDE*|@GUI_TK_INCLUDE@|g
s|*GUI_TK_LIBRARY*|@GUI_TK_LIBRARY@|g
s|*GUI_TK_LINK*|@GUI_TK_LINK@|g
s|*WX_LINK*|@WX_LINK@|g
s|*DL_LIBRARY*|@DL_LIBRARY@|g
s|*OPENGL_INCLUDE*|@OPENGL_INCLUDE@|g
s|*OPENGL_LIBRARY*|@OPENGL_LIBRARY@|g
@ -47,4 +48,4 @@ s|*THREADS_LINK*|@THREADS_LINK@|g
s|*EXTRA_LINK*|@EXTRA_LINK@|g
s|*GTK_JOYSTICK*|@GTK_JOYSTICK@|g
s|*UNIX_THREAD*|@UNIX_THREAD@|g
s|*IOBC_C_SRC*|@IODBC_C_SRC@|g
s|*IODBC_C_SRC*|@IODBC_C_SRC@|g

2
src/Makefile.in
View File

@ -41,7 +41,7 @@ SHARED_LIBRARY=lib$(LIB_TARGET).so.$(LIB_MAJOR).$(LIB_MINOR)
LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @GTK_JOYSTICK@ @UNIX_THREAD@
LIB_C_ALL_SRC=$(LIB_C_SRC) @IOBC_C_SRC@ parser.c
LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ parser.c
#define library objects
LIB_OBJ=\

2
src/common/parser.y
View File

@ -124,7 +124,7 @@ arg1 : WORD
%%
#ifdef __WXGTK__
#if defined(__WXGTK__) || defined(__WXMOTIF__)
#include "lexer.c"
#else
#include "../common/lex_yy.c"

4
src/generic/helpext.cpp
View File

@ -352,14 +352,14 @@ kbList::iterator::operator*()
kbList::iterator &
kbList::iterator::operator++()
{
node = node ? node->next : NULL;
node = node ? node->next : (kbListNode*)NULL;
return *this;
}
kbList::iterator &
kbList::iterator::operator--()
{
node = node ? node->prev : NULL;
node = node ? node->prev : (kbListNode*)NULL;
return *this;
}
kbList::iterator &

3
src/gtk.inc
View File

@ -131,7 +131,8 @@ LIB_CPP_SRC=\
generic/statusbr.cpp \
generic/tabg.cpp \
generic/textdlgg.cpp \
generic/treectrl.cpp
generic/treectrl.cpp \
generic/helpext.cpp
LIB_C_SRC=\
common/extended.c \

4
src/motif.inc
View File

@ -39,6 +39,7 @@ LIB_CPP_SRC=\
common/resource.cpp \
common/serbase.cpp \
common/string.cpp \
common/tbarbase.cpp \
common/textfile.cpp \
common/time.cpp \
common/timercmn.cpp \
@ -140,6 +141,9 @@ LIB_CPP_SRC=\
generic/treectrl.cpp
LIB_C_SRC=\
\
motif/xmcombo/xmcombo.c \
\
common/extended.c \
\
png/png.c \