Rebake from clean wx tree.

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

diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h
index fdb2e95681ef1a72023d1454d783a467b706603d..6407334fce888eb8af71c012fa9c6bb763486876 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
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 

-#ifdef __GNUG__
-#pragma interface "toolbar.h"
-#endif
-
-class WXDLLEXPORT wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase

 {
 public:
     // ctors and dtor
     wxToolBar() { Init(); }
 {
 public:
     // ctors and dtor
     wxToolBar() { Init(); }

-    
+

     wxToolBar(wxWindow *parent,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
     wxToolBar(wxWindow *parent,
         wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,


@@ -30,41 +26,41 @@ public:
         const wxString& name = wxToolBarNameStr)
     {
         Init();
         const wxString& name = wxToolBarNameStr)
     {
         Init();

-        
+

         Create(parent, id, pos, size, style, name);
     }
         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);
     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();
     virtual ~wxToolBar();

-    
+

     // override/implement base class virtuals
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
     // override/implement base class virtuals
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;

-    
+

     virtual bool Realize();
     virtual bool Realize();

-    
+

     // implementation from now on
     // implementation from now on

-    
+

     // find tool by widget
     wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
     // find tool by widget
     wxToolBarToolBase *FindToolByWidget(WXWidget w) const;

-    
-protected:
+
+private:

     // common part of all ctors
     void Init();
     // 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);
     // 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 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 wxString& label,
                                           const wxBitmap& bmpNormal,
     virtual wxToolBarToolBase *CreateTool(int id,
                                           const wxString& label,
                                           const wxBitmap& bmpNormal,


@@ -73,11 +69,15 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);

-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
-    
+    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
 private:
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
 
 #endif

-// _WX_TOOLBAR_H_
+    // _WX_TOOLBAR_H_