test for timegm() added

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 318a701601765b1459f2d33c9a5fa35af08c26cf..615d76c560c73209cf5d2637db44c8ed81c987bf 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -90,6 +90,14 @@ wxToolBarTool::wxToolBarTool(int theIndex,
   }
   m_shortHelpString = helpS1;
   m_longHelpString = helpS2;
   }
   m_shortHelpString = helpS1;
   m_longHelpString = helpS2;

+  m_control = (wxControl*) NULL;
+}
+
+wxToolBarTool::wxToolBarTool(wxControl *control)
+{
+    m_toolStyle = wxTOOL_STYLE_CONTROL;
+    m_control = control;
+    m_index = control->GetId();

 }
 
 wxToolBarTool::~wxToolBarTool()
 }
 
 wxToolBarTool::~wxToolBarTool()


@@ -186,7 +194,7 @@ void wxToolBarBase::OnMouseEnter ( int toolIndex )
 // created and used as the pushed/toggled image.
 // If toggle is TRUE, the button toggles between the two states.
 wxToolBarTool *wxToolBarBase::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
 // created and used as the pushed/toggled image.
 // If toggle is TRUE, the button toggles between the two states.
 wxToolBarTool *wxToolBarBase::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,

-             bool toggle, long xPos, long yPos, wxObject *clientData,
+             bool toggle, wxCoord xPos, wxCoord yPos, wxObject *clientData,

              const wxString& helpString1, const wxString& helpString2)
 {
 #ifdef __WXGTK__
              const wxString& helpString1, const wxString& helpString2)
 {
 #ifdef __WXGTK__