forked from pool/kicad
8cac49aae9
OBS-URL: https://build.opensuse.org/request/show/181187 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kicad?expand=0&rev=1
80 lines
3.4 KiB
Diff
80 lines
3.4 KiB
Diff
diff -urN kicad-2012.01.19-orig/common/wineda_toolbar.cpp kicad-2012.01.19/common/wineda_toolbar.cpp
|
|
--- kicad-2012.01.19-orig/common/wineda_toolbar.cpp 2011-11-27 13:43:14.000000000 +0100
|
|
+++ kicad-2012.01.19/common/wineda_toolbar.cpp 2012-08-28 19:31:04.726787095 +0200
|
|
@@ -11,10 +11,8 @@
|
|
|
|
|
|
EDA_TOOLBAR::EDA_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;
|
|
diff -urN kicad-2012.01.19-orig/eeschema/tool_sch.cpp kicad-2012.01.19/eeschema/tool_sch.cpp
|
|
--- kicad-2012.01.19-orig/eeschema/tool_sch.cpp 2011-11-27 13:43:14.000000000 +0100
|
|
+++ kicad-2012.01.19/eeschema/tool_sch.cpp 2012-08-28 19:58:10.582729686 +0200
|
|
@@ -140,7 +140,7 @@
|
|
_( "Back annotate component foot prints" ) );
|
|
|
|
// set icon paddings
|
|
- m_HToolBar->SetToolBorderPadding(3); // padding
|
|
+ //m_HToolBar->SetToolBorderPadding(3); // padding
|
|
m_HToolBar->SetToolSeparation(0);
|
|
//m_HToolBar->SetMargins(0,1); // margins width and height
|
|
|
|
@@ -225,7 +225,7 @@
|
|
HELP_DELETE_ITEMS, wxITEM_CHECK );
|
|
|
|
// set icon paddings
|
|
- m_VToolBar->SetToolBorderPadding(2); // padding
|
|
+ //m_VToolBar->SetToolBorderPadding(2); // padding
|
|
m_VToolBar->SetToolSeparation(0);
|
|
//m_VToolBar->SetMargins(1,0); // margins width and height
|
|
|
|
@@ -269,7 +269,7 @@
|
|
_( "HV orientation for wires and bus" ),
|
|
wxITEM_CHECK );
|
|
// set icon paddings
|
|
- m_OptionsToolBar->SetToolBorderPadding(2); // padding
|
|
+ //m_OptionsToolBar->SetToolBorderPadding(2); // padding
|
|
m_OptionsToolBar->SetToolSeparation(0);
|
|
//m_OptionsToolBar->SetMargins(4,0); // margins width and height
|
|
|
|
diff -urN kicad-2012.01.19-orig/include/wxstruct.h kicad-2012.01.19/include/wxstruct.h
|
|
--- kicad-2012.01.19-orig/include/wxstruct.h 2011-11-27 13:43:14.000000000 +0100
|
|
+++ kicad-2012.01.19/include/wxstruct.h 2012-08-28 19:41:20.270765363 +0200
|
|
@@ -900,7 +900,7 @@
|
|
* Class EDA_TOOLBAR
|
|
* is the base class for deriving KiCad tool bars.
|
|
*/
|
|
-class EDA_TOOLBAR : public wxAuiToolBar
|
|
+class EDA_TOOLBAR : public wxToolBar
|
|
{
|
|
public:
|
|
wxWindow* m_Parent;
|
|
@@ -910,7 +910,7 @@
|
|
public:
|
|
EDA_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,
|
|
diff -urN kicad-2012.01.19-orig/pcbnew/tool_pcb.cpp kicad-2012.01.19/pcbnew/tool_pcb.cpp
|
|
--- kicad-2012.01.19-orig/pcbnew/tool_pcb.cpp 2011-11-27 13:43:14.000000000 +0100
|
|
+++ kicad-2012.01.19/pcbnew/tool_pcb.cpp 2012-08-28 20:10:37.318703318 +0200
|
|
@@ -168,7 +168,7 @@
|
|
|
|
if( m_HToolBar && ! first_call )
|
|
{
|
|
- m_HToolBar->SetToolBitmap( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, *LayerPairBitmap );
|
|
+ //m_HToolBar->SetToolBitmap( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, *LayerPairBitmap );
|
|
m_HToolBar->Refresh();
|
|
}
|
|
}
|