X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ea48a1f23b2c9763778f60405f051cac8bf781b..159b66c02a8f1c724d1af3c768ad5d90f4c8a0e2:/include/wx/tbarbase.h?ds=sidebyside

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index cf7eeac27c..be2c52c70b 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -22,6 +22,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_TOOLBAR
+
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -236,7 +238,7 @@ public:
     // between the two states.
     wxToolBarToolBase *AddTool(int id,
                                const wxBitmap& bitmap,
-                               const wxBitmap& pushedBitmap = wxNullBitmap,
+                               const wxBitmap& pushedBitmap,
                                bool toggle = FALSE,
                                wxObject *clientData = NULL,
                                const wxString& shortHelpString = wxEmptyString,
@@ -335,7 +337,7 @@ public:
     virtual void SetToolSeparation(int separation)
         { m_toolSeparation = separation; }
 
-    virtual wxSize GetToolMargins() { return GetToolMargins(); }
+    virtual wxSize GetToolMargins() { return GetMargins(); }
     virtual int GetToolPacking() { return m_toolPacking; }
     virtual int GetToolSeparation() { return m_toolSeparation; }
 
@@ -410,8 +412,8 @@ public:
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void DoToolbarUpdates();
 
-    // Don't want toolbars to accept the focus
-    bool AcceptsFocus() const { return FALSE; }
+    // don't want toolbars to accept the focus by tabbing to them
+    virtual bool AcceptsFocusFromKeyboard() const { return FALSE; }
 
 protected:
     // to implement in derived classes
@@ -473,6 +475,8 @@ private:
     DECLARE_CLASS(wxToolBarBase)
 };
 
+#endif // wxUSE_TOOLBAR
+
 #endif
     // _WX_TBARBASE_H_