fix header files so that they can be included directly without generating 'undefined...

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

diff --git a/include/wx/richtext/richtextbulletspage.h b/include/wx/richtext/richtextbulletspage.h
index 1ef9bfe70a6076cf6770a706b9343ee251b9bd3b..bbfcc893ba0808c26997f146ec9ca4077737f904 100644 (file)
--- a/include/wx/richtext/richtextbulletspage.h
+++ b/include/wx/richtext/richtextbulletspage.h
@@ -15,6 +15,7 @@
 /*!
  * Includes
  */
 /*!
  * Includes
  */

+#include "wx/spinbutt.h"        // for wxSpinEvent

 
 /*!
  * Forward declarations
 
 /*!
  * Forward declarations

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 0ff7c9373aff3565f4931e3a6fcab06066a173f7..0ffef62ce3156d729df2c66cc68b9d5457d7a9fc 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -394,7 +394,7 @@ public:
     virtual void SetToolDisabledBitmap(int WXUNUSED(id),
                                        const wxBitmap& WXUNUSED(bitmap)) {}
 
     virtual void SetToolDisabledBitmap(int WXUNUSED(id),
                                        const wxBitmap& WXUNUSED(bitmap)) {}
 

-    
+

     // margins/packing/separation
     // --------------------------
 
     // margins/packing/separation
     // --------------------------
 


@@ -443,7 +443,7 @@ public:
     wxToolBarToolBase *FindById(int toolid) const;
 
     // return true if this is a vertical toolbar, otherwise false
     wxToolBarToolBase *FindById(int toolid) const;
 
     // return true if this is a vertical toolbar, otherwise false

-    bool IsVertical() const { return HasFlag(wxTB_LEFT | wxTB_RIGHT); }
+    bool IsVertical() const;

 
 
     // the old versions of the various methods kept for compatibility
 
 
     // the old versions of the various methods kept for compatibility

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 071dac26d3558a0953d1efcfffd357c39108e316..abb467f5ca1882ee03afe354726cc64195d8c447 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -125,6 +125,7 @@ void wxToolBarToolBase::SetDropdownMenu(wxMenu* menu)
     m_dropdownMenu = menu;
 }
 
     m_dropdownMenu = menu;
 }
 

+

 // ----------------------------------------------------------------------------
 // wxToolBarBase adding/deleting items
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxToolBarBase adding/deleting items
 // ----------------------------------------------------------------------------


@@ -596,6 +597,12 @@ void wxToolBarBase::SetRows(int WXUNUSED(nRows))
     // nothing
 }
 
     // nothing
 }
 

+bool wxToolBarBase::IsVertical() const
+{
+    return HasFlag(wxTB_LEFT | wxTB_RIGHT);
+}
+
+

 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------