Update to Scintilla 1.53

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 20883df2cd43789a374b6e35c95d95fc08474513..252e43e6f598b80f48c340a7360155a5bad61de9 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -370,6 +370,9 @@ public:
     virtual wxObject *GetToolClientData(int toolid) const;
     virtual void SetToolClientData(int toolid, wxObject *clientData);
 
     virtual wxObject *GetToolClientData(int toolid) const;
     virtual void SetToolClientData(int toolid, wxObject *clientData);
 

+    // returns tool pos, or wxNOT_FOUND if tool isn't found
+    virtual int GetToolPos(int id) const;
+

     // return TRUE if the tool is toggled
     virtual bool GetToolState(int toolid) const;
 
     // return TRUE if the tool is toggled
     virtual bool GetToolState(int toolid) const;
 


@@ -522,10 +525,8 @@ public:
 
     size_t GetToolsCount() const { return m_tools.GetCount(); }
 
 
     size_t GetToolsCount() const { return m_tools.GetCount(); }
 

-    void OnIdle(wxIdleEvent& event);
-

     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)

-    virtual void DoToolbarUpdates();
+    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) ;

 
     // don't want toolbars to accept the focus
     virtual bool AcceptsFocus() const { return FALSE; }
 
     // don't want toolbars to accept the focus
     virtual bool AcceptsFocus() const { return FALSE; }