Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index 6a3fc3438fd816cae9ff2312b251a8aff6371c0d..acb2ec8fbdab951c17189fdc6275ee68c6a27a8f 100644 (file)
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        toolbar.h
+// Name:        wx/os2/toolbar.h

 // Purpose:     wxToolBar class
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/98
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxToolBar class
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/98
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_


@@ -19,7 +19,7 @@
 #define ID_TOOLTIMER                100
 #define ID_TOOLEXPTIMER             101
 
 #define ID_TOOLTIMER                100
 #define ID_TOOLEXPTIMER             101
 

-class WXDLLEXPORT wxToolBar: public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase

 {
 public:
     /*
 {
 public:
     /*


@@ -35,7 +35,7 @@ public:
                      ,wxWindowID      vId
                      ,const wxPoint&  rPos = wxDefaultPosition
                      ,const wxSize&   rSize = wxDefaultSize
                      ,wxWindowID      vId
                      ,const wxPoint&  rPos = wxDefaultPosition
                      ,const wxSize&   rSize = wxDefaultSize

-                     ,long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL
+                     ,long            lStyle = wxTB_HORIZONTAL

                      ,const wxString& rName = wxToolBarNameStr
                     ) : m_vToolTimer(this, ID_TOOLTIMER)
                       , m_vToolExpTimer(this, ID_TOOLEXPTIMER)
                      ,const wxString& rName = wxToolBarNameStr
                     ) : m_vToolTimer(this, ID_TOOLTIMER)
                       , m_vToolExpTimer(this, ID_TOOLEXPTIMER)


@@ -55,7 +55,7 @@ public:
                 ,wxWindowID      vId
                 ,const wxPoint&  rPos = wxDefaultPosition
                 ,const wxSize&   rSize = wxDefaultSize
                 ,wxWindowID      vId
                 ,const wxPoint&  rPos = wxDefaultPosition
                 ,const wxSize&   rSize = wxDefaultSize

-                ,long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL
+                ,long            lStyle = wxTB_HORIZONTAL

                 ,const wxString& rName = wxToolBarNameStr
                );
 
                 ,const wxString& rName = wxToolBarNameStr
                );
 


@@ -165,7 +165,8 @@ protected:
                                           ,const wxString& rsShortHelp
                                           ,const wxString& rsLongHelp
                                          );
                                           ,const wxString& rsShortHelp
                                           ,const wxString& rsLongHelp
                                          );

-    virtual wxToolBarToolBase* CreateTool(wxControl* pControl);
+    virtual wxToolBarToolBase* CreateTool(wxControl* pControl,
+                                          const wxString& label);

 
     //
     // Helpers
 
     //
     // Helpers