CanAcceptFocus() now returns true if either the window itself or one of its children...

[wxWidgets.git] / include / wx / motif / toolbar.h

diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index f7864c43afb6f573afd47ccdcea243a02b25fb33..c577b02a8f3e142f0e516312834faeaaac40cdb2 100644 (file)
--- a/include/wx/motif/toolbar.h
+++ b/include/wx/motif/toolbar.h
@@ -6,22 +6,18 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
-#ifdef __GNUG__
-#pragma interface "toolbar.h"
-#endif
-
 class WXDLLEXPORT wxToolBar : public wxToolBarBase
 {
 public:
     // ctors and dtor
     wxToolBar() { Init(); }
-    
+
     wxToolBar(wxWindow *parent,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
@@ -30,53 +26,58 @@ public:
         const wxString& name = wxToolBarNameStr)
     {
         Init();
-        
+
         Create(parent, id, pos, size, style, name);
     }
-    
+
     bool Create(wxWindow *parent,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxNO_BORDER | wxTB_HORIZONTAL,
         const wxString& name = wxToolBarNameStr);
-    
+
     virtual ~wxToolBar();
-    
+
     // override/implement base class virtuals
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
-    
+
     virtual bool Realize();
-    
+
     // implementation from now on
-    
+
     // find tool by widget
     wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
-    
-protected:
+
+private:
     // common part of all ctors
     void Init();
-    
+
     // implement base class pure virtuals
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
-    
+
     virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
     virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
-    
+
     virtual wxToolBarToolBase *CreateTool(int id,
-        const wxBitmap& bitmap1,
-        const wxBitmap& bitmap2,
-        bool toggle,
-        wxObject *clientData,
-        const wxString& shortHelpString,
-        const wxString& longHelpString);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
-    
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
+                                          wxObject *clientData,
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);
+
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 
 #endif
-// _WX_TOOLBAR_H_
+    // _WX_TOOLBAR_H_