File build-with-old-wxwidgets.diff of Package kicad
Index: kicad-2010-04-06-SVN2508/common/toolbars.cpp
===================================================================
--- kicad-2010-04-06-SVN2508.orig/common/toolbars.cpp
+++ kicad-2010-04-06-SVN2508/common/toolbars.cpp
@@ -12,10 +12,8 @@
WinEDA_Toolbar::WinEDA_Toolbar( id_toolbar type, wxWindow * parent,
wxWindowID id, bool horizontal ):
- wxAuiToolBar( parent, id, wxDefaultPosition, wxDefaultSize,
- wxAUI_TB_DEFAULT_STYLE | ( ( horizontal ) ?
- wxAUI_TB_HORZ_LAYOUT :
- wxAUI_TB_VERTICAL ) )
+ wxToolBar( parent, id, wxDefaultPosition, wxDefaultSize,
+ horizontal ? wxTB_HORIZONTAL : wxTB_VERTICAL )
{
m_Parent = parent;
m_Ident = type;
Index: kicad-2010-04-06-SVN2508/include/wxstruct.h
===================================================================
--- kicad-2010-04-06-SVN2508.orig/include/wxstruct.h
+++ kicad-2010-04-06-SVN2508/include/wxstruct.h
@@ -710,7 +710,7 @@ public:
/* class WinEDA_Toolbar */
/*************************/
-class WinEDA_Toolbar : public wxAuiToolBar
+class WinEDA_Toolbar : public wxToolBar
{
public:
wxWindow* m_Parent;
@@ -721,7 +721,7 @@ public:
WinEDA_Toolbar( id_toolbar type, wxWindow* parent,
wxWindowID id, bool horizontal );
- bool GetToolState( int toolId ) { return GetToolToggled(toolId); };
+// bool GetToolState( int toolId ) { return GetToolToggled(toolId); };
void AddRadioTool( int toolid,
const wxString& label,