Corrected wxGTK.spec as per 2.1.14 (hadn't commited),
Removed include "gtk.h" from the public pen.h header and added check for this to configure etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1531,6 +1531,7 @@ GUI_TK_LIBRARY=
|
||||
GUI_TK_LINK=
|
||||
|
||||
WXGTK12=
|
||||
WXGTK127=
|
||||
WXGTK13=
|
||||
|
||||
WXWINE=
|
||||
@@ -1591,6 +1592,7 @@ fi
|
||||
if test "$wxUSE_GTK" = 1; then
|
||||
dnl avoid calling AM_PATH_GTK twice, so check first for the newer version
|
||||
dnl and only then, if it wasn't found, for an older one
|
||||
AM_PATH_GTK(1.2.7, WXGTK127=1)
|
||||
AM_PATH_GTK(1.2.3, WXGTK12=1)
|
||||
|
||||
if test "$WXGTK12" != 1; then
|
||||
@@ -2551,6 +2553,10 @@ if test "$WXGTK12" = 1 ; then
|
||||
AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12)
|
||||
fi
|
||||
|
||||
if test "$WXGTK127" = 1 ; then
|
||||
AC_DEFINE_UNQUOTED(__WXGTK127__,$WXGTK127)
|
||||
fi
|
||||
|
||||
if test "$WXWINE" = 1 ; then
|
||||
TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
|
||||
fi
|
||||
|
Reference in New Issue
Block a user