fix for gccxml

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h
index 1e30b0ad4007663d31a165c96b2c4c3e928181d4..fe824ebc0291eac4bf5fb4eee00bf92bbbefe21c 100644 (file)
--- a/include/wx/aui/auibar.h
+++ b/include/wx/aui/auibar.h
@@ -17,6 +17,10 @@
 #if wxUSE_AUI
 
 #include "wx/control.h"
 #if wxUSE_AUI
 
 #include "wx/control.h"

+#include "wx/sizer.h"
+#include "wx/pen.h"
+
+//class WXDLLIMPEXP_FWD_CORE wxSizerItem;

 
 enum wxAuiToolBarStyle
 {
 
 enum wxAuiToolBarStyle
 {


@@ -101,7 +105,7 @@ private:
 class WXDLLIMPEXP_AUI wxAuiToolBarItem
 {
     friend class wxAuiToolBar;
 class WXDLLIMPEXP_AUI wxAuiToolBarItem
 {
     friend class wxAuiToolBar;

-    
+

 public:
 
     wxAuiToolBarItem()
 public:
 
     wxAuiToolBarItem()


@@ -151,59 +155,59 @@ public:
         sticky = c.sticky;
         user_data = c.user_data;
     }
         sticky = c.sticky;
         user_data = c.user_data;
     }

-    
-    
+
+

     void SetWindow(wxWindow* w) { window = w; }
     wxWindow* GetWindow() { return window; }
     void SetWindow(wxWindow* w) { window = w; }
     wxWindow* GetWindow() { return window; }

-    
+

     void SetId(int new_id) { id = new_id; }
     int GetId() const { return id; }
     void SetId(int new_id) { id = new_id; }
     int GetId() const { return id; }

-    
+

     void SetKind(int new_kind) { kind = new_kind; }
     int GetKind() const { return kind; }
     void SetKind(int new_kind) { kind = new_kind; }
     int GetKind() const { return kind; }

-    
+

     void SetState(int new_state) { state = new_state; }
     int GetState() const { return state; }
     void SetState(int new_state) { state = new_state; }
     int GetState() const { return state; }

-    
+

     void SetSizerItem(wxSizerItem* s) { sizer_item = s; }
     wxSizerItem* GetSizerItem() const { return sizer_item; }
     void SetSizerItem(wxSizerItem* s) { sizer_item = s; }
     wxSizerItem* GetSizerItem() const { return sizer_item; }

-    
+

     void SetLabel(const wxString& s) { label = s; }
     const wxString& GetLabel() const { return label; }
     void SetLabel(const wxString& s) { label = s; }
     const wxString& GetLabel() const { return label; }

-    
+

     void SetBitmap(const wxBitmap& bmp) { bitmap = bmp; }
     const wxBitmap& GetBitmap() const { return bitmap; }
     void SetBitmap(const wxBitmap& bmp) { bitmap = bmp; }
     const wxBitmap& GetBitmap() const { return bitmap; }

-    
+

     void SetDisabledBitmap(const wxBitmap& bmp) { disabled_bitmap = bmp; }
     const wxBitmap& GetDisabledBitmap() const { return disabled_bitmap; }
     void SetDisabledBitmap(const wxBitmap& bmp) { disabled_bitmap = bmp; }
     const wxBitmap& GetDisabledBitmap() const { return disabled_bitmap; }

-    
+

     void SetHoverBitmap(const wxBitmap& bmp) { hover_bitmap = bmp; }
     const wxBitmap& GetHoverBitmap() const { return hover_bitmap; }
     void SetHoverBitmap(const wxBitmap& bmp) { hover_bitmap = bmp; }
     const wxBitmap& GetHoverBitmap() const { return hover_bitmap; }

-    
+

     void SetShortHelp(const wxString& s) { short_help = s; }
     const wxString& GetShortHelp() const { return short_help; }
     void SetShortHelp(const wxString& s) { short_help = s; }
     const wxString& GetShortHelp() const { return short_help; }

-    
+

     void SetLongHelp(const wxString& s) { long_help = s; }
     const wxString& GetLongHelp() const { return long_help; }
     void SetLongHelp(const wxString& s) { long_help = s; }
     const wxString& GetLongHelp() const { return long_help; }

-    
+

     void SetMinSize(const wxSize& s) { min_size = s; }
     const wxSize& GetMinSize() const { return min_size; }
     void SetMinSize(const wxSize& s) { min_size = s; }
     const wxSize& GetMinSize() const { return min_size; }

-    
+

     void SetSpacerPixels(int s) { spacer_pixels = s; }
     int GetSpacerPixels() const { return spacer_pixels; }
     void SetSpacerPixels(int s) { spacer_pixels = s; }
     int GetSpacerPixels() const { return spacer_pixels; }

-    
+

     void SetProportion(int p) { proportion = p; }
     int GetProportion() const { return proportion; }
     void SetProportion(int p) { proportion = p; }
     int GetProportion() const { return proportion; }

-    
+

     void SetActive(bool b) { active = b; }
     bool IsActive() const { return active; }
     void SetActive(bool b) { active = b; }
     bool IsActive() const { return active; }

-    
+

     void SetHasDropDown(bool b) { dropdown = b; }
     bool HasDropDown() const { return dropdown; }
     void SetHasDropDown(bool b) { dropdown = b; }
     bool HasDropDown() const { return dropdown; }

-    
+

     void SetSticky(bool b) { sticky = b; }
     bool IsSticky() const { return sticky; }
     void SetSticky(bool b) { sticky = b; }
     bool IsSticky() const { return sticky; }

-    
+

     void SetUserData(long l) { user_data = l; }
     long GetUserData() const { return user_data; }
 
     void SetUserData(long l) { user_data = l; }
     long GetUserData() const { return user_data; }
 

diff --git a/utils/ifacecheck/rungccxml.sh.in b/utils/ifacecheck/rungccxml.sh.in
index c18eae5ae96a7fbe8e78cecd4298ad5a38108c6f..57a463b00809e93d9a08b3be11daec8066ec149b 100755 (executable)
--- a/utils/ifacecheck/rungccxml.sh.in
+++ b/utils/ifacecheck/rungccxml.sh.in
@@ -44,6 +44,7 @@ headerlist=`$listcmd | grep -v wxshl | grep -v wx_cw | grep -v setup | grep -v x
 cd $current                          # return to the original path
 
 # create the header file to pass to gccxml
 cd $current                          # return to the original path
 
 # create the header file to pass to gccxml

+echo "Creating the $allheaders dummy file which #includes all wxWidgets interface header files..."

 if [[ -f $allheaders ]]; then rm $allheaders; fi
 for f in $headerlist; do
     echo "#include <$f>" >> $allheaders
 if [[ -f $allheaders ]]; then rm $allheaders; fi
 for f in $headerlist; do
     echo "#include <$f>" >> $allheaders


@@ -64,6 +65,10 @@ flags="-I . -I @top_srcdir@/include $flags -D__WXDEBUG__ -D__WX@TOOLKIT@__ -DWXB
 echo "Running gccxml on the $allheaders file... results in $gccxmloutput"
 if [[ -f "$gccxmloutput" ]]; then rm $gccxmloutput; fi
 gccxml $flags -fxml=$gccxmloutput
 echo "Running gccxml on the $allheaders file... results in $gccxmloutput"
 if [[ -f "$gccxmloutput" ]]; then rm $gccxmloutput; fi
 gccxml $flags -fxml=$gccxmloutput

+if [[ $? != 0 ]]; then
+    echo "Errors running gccxml... aborting."
+    exit
+fi

 
 # now get the list of the #defined values for wx headers, so that the result
 # can be passed to ifacecheck to aid the comparison
 
 # now get the list of the #defined values for wx headers, so that the result
 # can be passed to ifacecheck to aid the comparison