From bea74fbbebd7d859d94c803c1e0de3c8751a434b Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 21 Jun 1999 20:04:13 +0000 Subject: [PATCH] New Makefile.ins, updates for the Motif build, removed typos from configure, etc. Corrected typo in wxGTK's window.cpp related to [not] sending char events when Alt is pressed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 14 ++++++++++---- docs/gtk/install.txt | 2 +- docs/wine/install.txt | 2 +- src/common/image.cpp | 2 +- src/gtk/window.cpp | 2 +- src/gtk1/window.cpp | 2 +- src/motif/Makefile.am | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index c631edf60f..df29b962d2 100644 --- a/configure.in +++ b/configure.in @@ -1763,11 +1763,13 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then if test "$wxUSE_GTK" = 1; then if test "$WXGTK12" != 1; then AC_MSG_WARN([Drag and drop is only supported under wxGTK 2.1]) + wxUSE_DRAG_AND_DROP=no fi fi if test "$wxUSE_MOTIF" = 1; then AC_MSG_WARN([Drag and drop is not yet supported under Motif]) + wxUSE_DRAG_AND_DROP=no fi if test "$wxUSE_DRAG_AND_DROP" = "yes"; then @@ -1888,7 +1890,11 @@ if test "$wxUSE_STATLINE" = "yes"; then if test "$wxUSE_WINE" = 1 ; then AC_MSG_WARN([wxStaticLine is not supported under WINE]) else - AC_DEFINE(wxUSE_STATLINE) + if test "$wxUSE_MOTIF" = 1 ; then + AC_MSG_WARN([wxStaticLine is not supported under Motif]) + else + AC_DEFINE(wxUSE_STATLINE) + fi fi fi @@ -1908,10 +1914,10 @@ fi if test "$wxUSE_TOOLTIPS" = "yes"; then if test "$wxUSE_MOTIF" = 1; then - AC_MSG_WARN(Tooltips are not supported yet under Motif) + AC_MSG_WARN(wxTooltip not supported yet under Motif) else if test "$wxUSE_WINE" = 1; then - AC_MSG_WARN(Tooltips are not supported yet under WINE) + AC_MSG_WARN(wxTooltip not supported under WINE) else AC_DEFINE(wxUSE_TOOLTIPS) fi @@ -1993,7 +1999,7 @@ dnl all -I options we must pass to the compiler INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TOOLKIT_INCLUDE" dnl C/C++ compiler options used to compile wxWindows -if test "$ac_cv_prog_gcc" = "yes"; then +if test "$GXX" = yes ; then dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" CXXWARNINGS="-Wall" dnl there is one weird warning in docview.h:71 which prevents me from doing diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index bec266257b..263feec3ba 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -253,7 +253,7 @@ The following options handle the kind of library you want to build. This will speed-up compilation and reduce binary size. - --enable-no_rtti Enable compilation without creation of + --enable-no_exceptions Enable compilation without creation of C++ exception information in object files. This will speed-up compilation and reduce binary size. Also fewer crashes during the diff --git a/docs/wine/install.txt b/docs/wine/install.txt index cc53d660ca..8663d9b939 100644 --- a/docs/wine/install.txt +++ b/docs/wine/install.txt @@ -191,7 +191,7 @@ The following options handle the kind of library you want to build. This will speed-up compilation and reduce binary size. - --enable-no_rtti Enable compilation without creation of + --enable-no_exceptions Enable compilation without creation of C++ exception information in object files. This will speed-up compilation and reduce binary size. Also fewer crashes during the diff --git a/src/common/image.cpp b/src/common/image.cpp index 153472c88d..714750f706 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -1485,7 +1485,7 @@ wxImage::wxImage( const wxBitmap &bitmap ) vi = XGetVisualInfo( dpy, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem ); - wxCHECK_MSG( vi, wxNullBitmap, _T("no visual") ); + wxCHECK_RET( vi, _T("no visual") ); if ((bpp == 16) && (vi->red_mask != 0xf800)) bpp = 15; diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index fc09ed7eb5..c70a812f99 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -634,7 +634,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e /* wxMSW doesn't send char events with Alt pressed */ if ((key_code != 0) && ((gdk_event->state & GDK_MOD1_MASK) == 0) && - ((gdk_event->state & GDK_MOD1_MASK) == 0)) + ((gdk_event->state & GDK_MOD2_MASK) == 0)) { wxKeyEvent event2( wxEVT_CHAR ); event2.SetTimestamp( gdk_event->time ); diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index fc09ed7eb5..c70a812f99 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -634,7 +634,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e /* wxMSW doesn't send char events with Alt pressed */ if ((key_code != 0) && ((gdk_event->state & GDK_MOD1_MASK) == 0) && - ((gdk_event->state & GDK_MOD1_MASK) == 0)) + ((gdk_event->state & GDK_MOD2_MASK) == 0)) { wxKeyEvent event2( wxEVT_CHAR ); event2.SetTimestamp( gdk_event->time ); diff --git a/src/motif/Makefile.am b/src/motif/Makefile.am index faa471ef06..1eb1cc0bef 100644 --- a/src/motif/Makefile.am +++ b/src/motif/Makefile.am @@ -14,7 +14,7 @@ VPATH = .:${srcdir}:${srcdir}/../common:${srcdir}/../generic:${EXTRA_VPATH} EXTRA_DIST = "${srcdir}/../common ${srcdir}/../generic ${srcdir}" lib_LTLIBRARIES = @WX_LIBRARY_NAME@ -EXTRA_LTLIBRARIES = libwx_gtk.la libwx_motif.la +EXTRA_LTLIBRARIES = libwx_motif.la libwx_gtk.la libwx_msw.la # these are the common files which always make part of the library libwx_motif_la_SOURCES = \