Applied patch which allows you to detach a stream

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

diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h
index 5ca1a31a6811b800a1e2877b7175adce32eebb7a..feb9ae4bc3b26f87e3b7752b3be7d13104978219 100644 (file)
--- a/include/wx/univ/toolbar.h
+++ b/include/wx/univ/toolbar.h
@@ -6,16 +6,12 @@
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_TOOLBAR_H_
 #define _WX_UNIV_TOOLBAR_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_TOOLBAR_H_
 #define _WX_UNIV_TOOLBAR_H_
 

-#ifdef __GNUG__
-    #pragma interface "univtoolbar.h"
-#endif
-

 #include "wx/button.h"      // for wxStdButtonInputHandler
 
 class WXDLLEXPORT wxToolBarTool;
 #include "wx/button.h"      // for wxStdButtonInputHandler
 
 class WXDLLEXPORT wxToolBarTool;


@@ -63,6 +59,8 @@ public:
 
     virtual bool Realize();
 
 
     virtual bool Realize();
 

+    virtual void SetWindowStyleFlag( long style );
+

     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 
     virtual void SetToolShortHelp(int id, const wxString& helpString);
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
 
     virtual void SetToolShortHelp(int id, const wxString& helpString);


@@ -70,7 +68,10 @@ public:
     virtual void SetMargins(int x, int y);
     void SetMargins(const wxSize& size)
         { SetMargins((int) size.x, (int) size.y); }
     virtual void SetMargins(int x, int y);
     void SetMargins(const wxSize& size)
         { SetMargins((int) size.x, (int) size.y); }

-    
+
+    virtual bool PerformAction(const wxControlAction& action,
+                               long numArg = -1,
+                               const wxString& strArg = wxEmptyString);

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -93,11 +94,10 @@ protected:
                                           const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
                                           const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 

-    // implement wxUniversal methods
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = -1,
-                               const wxString& strArg = wxEmptyString);

     virtual wxSize DoGetBestClientSize() const;
     virtual wxSize DoGetBestClientSize() const;

+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);

     virtual void DoDraw(wxControlRenderer *renderer);
 
     // get the bounding rect for the given tool
     virtual void DoDraw(wxControlRenderer *renderer);
 
     // get the bounding rect for the given tool


@@ -107,7 +107,7 @@ protected:
     void RefreshTool(wxToolBarToolBase *tool);
 
     // (re)calculate the tool positions, should only be called if it is
     void RefreshTool(wxToolBarToolBase *tool);
 
     // (re)calculate the tool positions, should only be called if it is

-    // necessary to do it, i.e. m_needsLayout == TRUE
+    // necessary to do it, i.e. m_needsLayout == true

     void DoLayout();
     
     // get the rect limits depending on the orientation: top/bottom for a
     void DoLayout();
     
     // get the rect limits depending on the orientation: top/bottom for a