added wxSplitFile() to decompose a file name into path + name + ext

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

diff --git a/src/common/tbarsmpl.cpp b/src/common/tbarsmpl.cpp
index b14e1ee2b51ea5670180a55f09f9dca918fecfca..229cb6fe23761cc09b342be7f0fc77f0a07624d2 100644 (file)
--- a/src/common/tbarsmpl.cpp
+++ b/src/common/tbarsmpl.cpp
@@ -49,8 +49,8 @@ wxToolBarSimple::wxToolBarSimple(void)
 {
 }
 
 {
 }
 

-bool wxToolBarSimple::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, const long style,
-  const int direction, const int RowsOrColumns, const wxString& name )
+bool wxToolBarSimple::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style,
+  int direction, int RowsOrColumns, const wxString& name )

 {
        if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
                return FALSE;
 {
        if ( ! wxWindow::Create(parent, id, pos, size, style, name) )
                return FALSE;


@@ -119,18 +119,6 @@ void wxToolBarSimple::OnPaint (wxPaintEvent& event)
       DrawTool(dc, mem_dc, tool);
   }
 
       DrawTool(dc, mem_dc, tool);
   }
 

-/* Old code which drew a line beneath the toolbar - not generally
- * wanted.
-  int w, h;
-  GetClientSize( &w, &h );
-  wxPen * old_pen = dc.GetPen();
-  dc.SetPen( *white_pen );
-  dc.DrawLine(0,0,w,0);
-  dc.SetPen( *black_pen );
-  dc.DrawLine(0,(h-1),w,(h-1));
-  dc.SetPen( *old_pen );
-*/
-

   count--;
 }
 
   count--;
 }
 


@@ -323,7 +311,7 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
   }
 }
 
   }
 }
 

-void wxToolBarSimple::ToggleTool(const int index, const bool toggle)
+void wxToolBarSimple::ToggleTool(int index, bool toggle)

 {
   wxNode *node = m_tools.Find((long)index);
   if (node)
 {
   wxNode *node = m_tools.Find((long)index);
   if (node)


@@ -348,7 +336,7 @@ void wxToolBarSimple::ToggleTool(const int index, const bool toggle)
 // the tool we're leaving was a 'sprung push button' and if so,
 // spring it back to the up state.
 //
 // the tool we're leaving was a 'sprung push button' and if so,
 // spring it back to the up state.
 //

-void wxToolBarSimple::SpringUpButton(const int index)
+void wxToolBarSimple::SpringUpButton(int index)

 {
   wxNode *node=m_tools.Find((long)index);
   if (node) {
 {
   wxNode *node=m_tools.Find((long)index);
   if (node) {