1. wxTimer::Start() returns bool in wxGTK too (other minor corrections

[wxWidgets.git] / include / wx / gtk / tbargtk.h

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 369ca4e9ca3e7343cf29e4abd35b35351f0e4dde..93f6e7bafcd317639ae4ae35dbe70d8381e9694b 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -52,9 +52,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 +110,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 +133,6 @@ class wxToolBar: public wxControl
   
     GtkToolbar   *m_toolbar;
     wxList        m_tools;
-  
-  DECLARE_EVENT_TABLE()
 };
 
 #endif