X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f03fc89fff2d6e823e7d4d14fbe14822ad6777b1..752c7d6bbdf97037c9a2bf20625b47951b76aa4a:/include/wx/tbarbase.h?ds=sidebyside

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 3aa02843b5..48f37f7e08 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -44,7 +44,7 @@ class WXDLLEXPORT wxToolBarTool: public wxObject
                 int theIndex = 0, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
                 bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL, 
                 const wxString& shortHelpString = "", const wxString& longHelpString = "",
-                GtkWidget *item = (GtkWidget *) NULL );
+                GtkWidget *pixmap = (GtkWidget *) NULL );
 #else
   wxToolBarTool(int theIndex, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
                 bool toggle = FALSE, long xPos = -1, long yPos = -1,
@@ -75,6 +75,7 @@ public:
 #ifdef __WXGTK__
   wxToolBar            *m_owner;
   GtkWidget            *m_item;
+  GtkWidget            *m_pixmap;
 #endif
 };
 
@@ -208,11 +209,6 @@ class WXDLLEXPORT wxToolBarBase : public wxControl
   void OnSize(wxSizeEvent& event);
   void OnIdle(wxIdleEvent& event);
 
-  // Required to force normal cursor-setting behaviour in Windows
-#ifdef __WXMSW__
-  virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
-#endif
-
  protected:
   wxList                m_tools;
 //  int                   m_tilingDirection;