Eliminated some warnings under Windows; wxGetHomeDir problem in wxFile;

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

diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index 667f84ff47f01fe1e6089a21ef6facf85c772144..93f6e7bafcd317639ae4ae35dbe70d8381e9694b 100644 (file)
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -24,7 +24,7 @@
 //-----------------------------------------------------------------------------
 
 class wxToolBarTool;
-class wxToolBarGTK;
+class wxToolBar;
 
 //-----------------------------------------------------------------------------
 // constants
@@ -50,10 +50,11 @@ class wxToolBarTool: public wxObject
   public:
 
     wxToolBarTool(void) {}; 
-    wxToolBarTool( wxToolBarGTK *owner, int theIndex = 0, 
+    wxToolBarTool( wxToolBar *owner, int theIndex = 0, 
       const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
-      bool toggle = FALSE, wxObject *clientData = NULL, 
-      const wxString& shortHelpString = "", const wxString& longHelpString = "");
+      bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL, 
+      const wxString& shortHelpString = "", const wxString& longHelpString = "",
+      GtkWidget *item = (GtkWidget *) NULL );
    ~wxToolBarTool(void);
 
   public:
@@ -70,24 +71,25 @@ class wxToolBarTool: public wxObject
     bool                  m_isMenuCommand;
     wxString              m_shortHelpString;
     wxString              m_longHelpString;
-    wxToolBarGTK         *m_owner;
+    wxToolBar            *m_owner;
+    GtkWidget            *m_item;
 };
 
 //-----------------------------------------------------------------------------
-// wxToolBarGTK
+// wxToolBar
 //-----------------------------------------------------------------------------
 
-class wxToolBarGTK: public wxControl
+class wxToolBar: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxToolBarGTK)
+  DECLARE_DYNAMIC_CLASS(wxToolBar)
   
   public:
 
-    wxToolBarGTK(void);
-    wxToolBarGTK( wxWindow *parent, wxWindowID id, 
+    wxToolBar(void);
+    wxToolBar( wxWindow *parent, wxWindowID id, 
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = 0, const wxString& name = wxToolBarNameStr );
-   ~wxToolBarGTK(void);
+   ~wxToolBar(void);
 
    bool Create( wxWindow *parent, wxWindowID id, 
      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -108,14 +110,15 @@ class wxToolBarGTK: 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);
+    
+    virtual void Realize(void);
 
     virtual void EnableTool(int toolIndex, bool enable);
     virtual void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
-    virtual void SetToggle(int toolIndex, bool toggle); // Set this to be togglable (or not)
     virtual wxObject *GetToolClientData(int index) const;
 
     virtual bool GetToolState(int toolIndex) const;
@@ -130,8 +133,6 @@ class wxToolBarGTK: public wxControl
   
     GtkToolbar   *m_toolbar;
     wxList        m_tools;
-  
-  DECLARE_EVENT_TABLE()
 };
 
 #endif