Fix for wxTextCtrl::GetSelection for singel line controls in GTK2 mode

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

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 794859e2154a6633c3f1c12aab51798af55c556b..5992b118179b368dd95805f5b1203804dc179d34 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -525,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; }


@@ -608,7 +606,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

-    DECLARE_CLASS(wxToolBarBase)
+    DECLARE_NO_COPY_CLASS(wxToolBarBase)

 };
 
 // Helper function for creating the image for disabled buttons
 };
 
 // Helper function for creating the image for disabled buttons