added check for GTK 1.2

added symbol __WXGTK12__  (do not use GTK_MINOR_VERSION in your code
    as this is undefined anywhere outside wxGTK itself)
  updated wxGTK.spec for local builds
  fixed clipboard clear/setdata race
  test for wxConvLocal in dialogs sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-04-26 20:48:39 +00:00
parent 5f709e6725
commit e5ea3f7a96
10 changed files with 833 additions and 495 deletions

View File

@@ -1111,6 +1111,8 @@ WX_LINK=
MAKEINCLUDE=
WXGTK12=
if test "$wxUSE_GTK" = 1; then
AM_PATH_GTK(1.0.0, [
GUI_TK_INCLUDE="$GTK_CFLAGS"
@@ -1120,6 +1122,9 @@ if test "$wxUSE_GTK" = 1; then
TOOLKIT_DEF=__WXGTK__
WX_LINK=-lwx_gtk2
MAKEINCLUDE=../gtk.inc
AM_PATH_GTK(1.2.0, [
WXGTK12=1
], AC_MSG_RESULT(no))
fi
if test "$wxUSE_QT" = 1; then
@@ -1224,6 +1229,10 @@ dnl ----------------------------------------------------------------
dnl Register compile options for makefiles and setup.h
dnl ----------------------------------------------------------------
if test "$WXGTK12" = 1 ; then
AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12)
fi
EXTRA_LINK=
WXDEBUG=
@@ -1488,7 +1497,12 @@ if test "$wxUSE_TOOLTIPS" = 1 ; then
fi
if test "$wxUSE_DRAG_AND_DROP" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_DRAG_AND_DROP,$wxUSE_DRAG_AND_DROP)
if test "$WXGTK12" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_DRAG_AND_DROP,$wxUSE_DRAG_AND_DROP)
else
AC_MSG_WARN(drag and drop is only supported under GTK 1.2, sorry)
wxUSE_DRAG_AND_DROP=0
fi
fi
dnl ----------------------------------------------------------------