Applied patch for wxComboBox and wxListBox to

[wxWidgets.git] / include / wx / tbarbase.h

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 81062fe3046d096cb5e54dcd2933183548b0bbd6..be2c52c70bcba59e2ded025d3675284e40fc42f4 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -22,6 +22,8 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_TOOLBAR
+

 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/control.h"


@@ -335,7 +337,7 @@ public:
     virtual void SetToolSeparation(int separation)
         { m_toolSeparation = separation; }
 
     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; }
 
     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();
 
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void DoToolbarUpdates();
 

-    // Don't want toolbars to accept the focus
-    virtual 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
 
 protected:
     // to implement in derived classes


@@ -473,6 +475,8 @@ private:
     DECLARE_CLASS(wxToolBarBase)
 };
 
     DECLARE_CLASS(wxToolBarBase)
 };
 

+#endif // wxUSE_TOOLBAR
+

 #endif
     // _WX_TBARBASE_H_
 
 #endif
     // _WX_TBARBASE_H_