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

Fixed typos in window.cpp and utils.cpp

Browse Source 
Tried to repair HP-UX compilation thing for iODBC.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1999-05-21 12:50:10 +00:00
parent fc5a93cd09
commit 63cc5d9d20
6 changed files with 435 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

745
configure vendored
View File

File diff suppressed because it is too large Load Diff

60
configure.in
View File

@ -1340,13 +1340,6 @@ dnl JPEG_LINK="-ljpeg"
dnl fi
AC_SUBST(JPEG_LINK)
IODBC_C_SRC=""
if test "$wxUSE_ODBC" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC)
IODBC_C_SRC="\$(IODBC_C_SRC)"
fi
AC_SUBST(IODBC_C_SRC)
dnl ----------------------------------------------------------------
dnl thread support
dnl ----------------------------------------------------------------
@ -1522,6 +1515,7 @@ dnl wxLibrary class
dnl ------------------------------------------------------------------------
HAVE_DL_FUNCS=0
HAVE_SHL_FUNCS=0
if test "$wxUSE_DYNLIB_CLASS" = "1"; then
dnl the test is a bit complicated because we check for dlopen() both with
dnl and without -ldl
@ -1529,11 +1523,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "1"; then
[AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1],
[AC_CHECK_LIB(dl, dlopen,
[AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1])])
AC_CHECK_FUNCS(shl_load, [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1])
AC_CHECK_FUNCS( shl_load,
[AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1])
if test "$HAVE_DL_FUNCS" = 0; then
AC_MSG_WARN("--with-dynlib will be disabled because no function was found to load a shared library on this platform")
AC_MSG_WARN("--with-dynlib and --with-odbc will be disabled due to missing shared library support")
wxUSE_ODBC=0
wxUSE_DYNLIB_CLASS=0
fi
fi
@ -1542,6 +1537,17 @@ if test "$wxUSE_DYNLIB_CLASS" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_DYNLIB_CLASS,$wxUSE_DYNLIB_CLASS)
fi
dnl ----------------------------------------------------------------
dnl iODBC support
dnl ----------------------------------------------------------------
IODBC_C_SRC=""
if test "$wxUSE_ODBC" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC)
IODBC_C_SRC="\$(IODBC_C_SRC)"
fi
AC_SUBST(IODBC_C_SRC)
dnl ----------------------------------------------------------------
dnl Register Prolog and Resources options for makefiles and setup.h
dnl ----------------------------------------------------------------
@ -1744,18 +1750,38 @@ case "${canonical}" in
PICFLAGS=
esac
if test "x$GCC" = xyes; then
dnl ------------------------------------------------------------------------
dnl compiler flags for C++ and C
dnl ------------------------------------------------------------------------
dnl if test "x$GCC" = xyes; then
dnl CFLAGS="${CFLAGS} -Wall -Wno-unused -Wno-uninitialized -D_REENTRANT -DLEX_SCANNER -DHAVE_LIBDL"
dnl fi
dnl
dnl if test "x$GXX" = xyes; then
dnl if test "$wxUSE_MOTIF" = 1; then
dnl CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused -D_REENTRANT"
dnl else
dnl CXXFLAGS="${CXXFLAGS} -Wall -D_REENTRANT"
dnl fi
dnl fi
if test "$HAVE_SHL_FUNCS" = 1; then
CFLAGS="${CFLAGS} -Wall -Wno-unused -Wno-uninitialized -D_REENTRANT -DLEX_SCANNER -DHAVE_SHL_LOAD"
else
CFLAGS="${CFLAGS} -Wall -Wno-unused -Wno-uninitialized -D_REENTRANT -DLEX_SCANNER -DHAVE_LIBDL"
fi
if test "x$GXX" = xyes; then
if test "$wxUSE_MOTIF" = 1; then
CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused -D_REENTRANT"
else
CXXFLAGS="${CXXFLAGS} -Wall -D_REENTRANT"
fi
if test "$wxUSE_MOTIF" = 1; then
CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused -D_REENTRANT"
else
CXXFLAGS="${CXXFLAGS} -Wall -D_REENTRANT"
fi
dnl ------------------------------------------------------------------------
dnl maybe comeone can enlighten me what this does..
dnl ------------------------------------------------------------------------
if test "$wxUSE_SHARED" != 1; then
CREATE_SHARED=
PICFLAGS=

6
include/wx/utils.h
View File

@ -84,9 +84,9 @@ WXDLLEXPORT int wxGetOsVersion(int *majorVsn= (int *) NULL,int *minorVsn= (int *
// Return a string with the current date/time
WXDLLEXPORT wxString wxNow();
// Synthesize KeyUp events holding down a key and producing
// KeyDown events with autorepeat. On by default an always
// on in wxMSW.
// Don't synthesize KeyUp events holding down a key and producing
// KeyDown events with autorepeat. On by default and always on
// in wxMSW.
WXDLLEXPORT bool wxSetDetectableAutoRepeat( bool flag );
// ----------------------------------------------------------------------------

4
src/common/utilscmn.cpp
View File

@ -355,8 +355,8 @@ StringMatch (char *str1, char *str2, bool subString, bool exact)
return FALSE;
}
// Synthesize KeyUp events holding down a key and producing
// KeyDown events with autorepeat. On by default an always
// Don't synthesize KeyUp events holding down a key and producing
// KeyDown events with autorepeat. On by default and always on
// on in wxMSW. wxGTK version in utilsgtk.cpp.
#ifndef __WXGTK__
bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )

4
src/gtk/window.cpp
View File

@ -420,7 +420,7 @@ static void draw_frame( GtkWidget *widget, wxWindow *win )
if (scroll_window->hscrollbar_visible)
{
dh += 15; /* dh += hscrollbar->allocation.height; */
dw += scroll_class->scrollbar_spacing;
dh += scroll_class->scrollbar_spacing;
}
}
@ -2068,7 +2068,7 @@ void wxWindow::DoSetClientSize( int width, int height )
if (scroll_window->hscrollbar_visible)
{
dh += 15; /* dh += hscrollbar->allocation.height; */
dw += scroll_class->scrollbar_spacing;
dh += scroll_class->scrollbar_spacing;
}
}

4
src/gtk1/window.cpp
View File

@ -420,7 +420,7 @@ static void draw_frame( GtkWidget *widget, wxWindow *win )
if (scroll_window->hscrollbar_visible)
{
dh += 15; /* dh += hscrollbar->allocation.height; */
dw += scroll_class->scrollbar_spacing;
dh += scroll_class->scrollbar_spacing;
}
}
@ -2068,7 +2068,7 @@ void wxWindow::DoSetClientSize( int width, int height )
if (scroll_window->hscrollbar_visible)
{
dh += 15; /* dh += hscrollbar->allocation.height; */
dw += scroll_class->scrollbar_spacing;
dh += scroll_class->scrollbar_spacing;
}
}