Allow more than one line in a wxStaticText on iOS.

[wxWidgets.git] / utils / ifacecheck / rungccxml.sh.in

diff --git a/utils/ifacecheck/rungccxml.sh.in b/utils/ifacecheck/rungccxml.sh.in
index 86f6b4885fdb56e464f6ffc4aefeeff58507c4d0..0d6fcebb1a70aaa29c618229fd320664cb4ec6bd 100755 (executable)
--- a/utils/ifacecheck/rungccxml.sh.in
+++ b/utils/ifacecheck/rungccxml.sh.in
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# $Id$
 #
 # Runs gccxml on the wxWidgets include folder, in order to build the XML
 # file to fetch to ifacecheck to check the coherency of the wxWidgets
@@ -31,10 +30,9 @@ if [[ ! -z "$1" ]]; then
 fi
 
 me=$(basename $0)
-path=${0%%/$me}
-current=$(pwd)         # current path
+current=$(pwd)/${0%%/$me}            # current path
 
-#gccxmloutput="$current/$gccxmloutput"
+gccxmloutput="$current/$gccxmloutput"
 
 cd @top_srcdir@/include              # go to wx include folder
 
@@ -51,7 +49,9 @@ for f in $headerlist; do
 done
 
 # filter the configure flags to pass to gccxml
-flags="@CXXFLAGS@"
+wx_top_builddir="@wx_top_builddir@"
+top_srcdir="@top_srcdir@"
+flags="@CPPFLAGS@ @CXXFLAGS@"
 
 # NOTE: it's important to define __WXDEBUG__ because some functions of wx
 #       are declared (and thus parsed by gcc) only if that symbol is defined.
@@ -79,14 +79,5 @@ if [[ $? != 0 ]]; then
     exit
 fi
 
-# FIX for IFACECHECK
-# ==================
-
-# these fixes are needed to avoid false warnings/errors by ifacecheck
-
-if [[ "@TOOLKIT@" == "GTK" ]]; then
-    sed -i -e 's/default="wxBITMAP_TYPE_XPM"/default="wxBITMAP_DEFAULT_TYPE"/g' $gccxmloutput
-fi
-
 # cleanup
 rm $allheaders