X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc008f25922fe85d2308d4335c3cbc0ad436c60d..ed7174bafef77f3e99c5d47976f6ba1365960866:/include/wx/gtk/tbargtk.h diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h index 369ca4e9ca..ac40522343 100644 --- a/include/wx/gtk/tbargtk.h +++ b/include/wx/gtk/tbargtk.h @@ -2,8 +2,6 @@ // Name: tbargtk.h // Purpose: GTK toolbar // Author: Robert Roebling -// Modified by: -// Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Robert Roebling // Licence: wxWindows licence @@ -52,9 +50,9 @@ class wxToolBarTool: public wxObject wxToolBarTool(void) {}; wxToolBarTool( wxToolBar *owner, int theIndex = 0, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap, - bool toggle = FALSE, wxObject *clientData = NULL, + bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL, const wxString& shortHelpString = "", const wxString& longHelpString = "", - GtkWidget *item = NULL ); + GtkWidget *item = (GtkWidget *) NULL ); ~wxToolBarTool(void); public: @@ -110,7 +108,7 @@ class wxToolBar: public wxControl // If toggle is TRUE, the button toggles between the two states. virtual wxToolBarTool *AddTool( int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, bool toggle = FALSE, - float xPos = -1, float yPos = -1, wxObject *clientData = NULL, + float xPos = -1, float yPos = -1, wxObject *clientData = (wxObject *)NULL, const wxString& helpString1 = "", const wxString& helpString2 = ""); virtual void AddSeparator(void); virtual void ClearTools(void); @@ -133,8 +131,6 @@ class wxToolBar: public wxControl GtkToolbar *m_toolbar; wxList m_tools; - - DECLARE_EVENT_TABLE() }; #endif