Fix missing documentation for several GDI functions.

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

diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index 608d65311a0e7603fa10907e70dfdb43f7870e89..acb2ec8fbdab951c17189fdc6275ee68c6a27a8f 100644 (file)
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxToolBar class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxToolBar class
 // Author:      David Webster
 // Modified by:


@@ -13,12 +13,13 @@
 #define _WX_TOOLBAR_H_
 
 #if wxUSE_TOOLBAR
 #define _WX_TOOLBAR_H_
 
 #if wxUSE_TOOLBAR

+#include "wx/timer.h"

 #include "wx/tbarbase.h"
 
 #define ID_TOOLTIMER                100
 #define ID_TOOLEXPTIMER             101
 
 #include "wx/tbarbase.h"
 
 #define ID_TOOLTIMER                100
 #define ID_TOOLEXPTIMER             101
 

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

 {
 public:
     /*
 {
 public:
     /*


@@ -34,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)


@@ -54,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
                );
 


@@ -164,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


@@ -204,6 +206,15 @@ private:
     wxCoord                         m_vXMouse;
     wxCoord                         m_vYMouse;
 
     wxCoord                         m_vXMouse;
     wxCoord                         m_vYMouse;
 

+    //
+    // Virtual function hiding supression
+    virtual wxToolBarToolBase *InsertTool (size_t nPos, wxToolBarToolBase* pTool)
+    {
+        return( wxToolBarBase::InsertTool( nPos
+                                          ,pTool
+                                         ));
+    }
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };