Commit 0cedcb87 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Coding policy fixes.

parent bf44999a

3d-viewer/3d_toolbar.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar() 
    }





    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );

    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );



    // Set up toolbar

    m_HToolBar->AddTool( ID_RELOAD3D_BOARD, wxEmptyString,

3d-viewer/3d_viewer.h

+10 −10
Original line number Diff line number Diff line
@@ -208,8 +208,8 @@ private: 
    wxString        m_FrameName;       // name used for writing and reading setup

                                       // It is "Frame3D"

    Pcb3D_GLCanvas* m_Canvas;

    WinEDA_Toolbar*      m_HToolBar;

    WinEDA_Toolbar*      m_VToolBar;

    EDA_TOOLBAR*    m_HToolBar;

    EDA_TOOLBAR*    m_VToolBar;

    int             m_InternalUnits;

    wxPoint         m_FramePos;

    wxSize          m_FrameSize;

common/class_layer_box_selector.cpp

+8 −10
Original line number Diff line number Diff line
@@ -20,11 +20,10 @@ 
 *

 */



LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( WinEDA_Toolbar* parent, wxWindowID id,

LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( EDA_TOOLBAR* parent, wxWindowID id,

                                        const wxPoint& pos, const wxSize& size,

                                        int n, const wxString choices[] ) :

    wxBitmapComboBox( parent, id, wxEmptyString, pos, size,

                      n, choices, wxCB_READONLY )

    wxBitmapComboBox( parent, id, wxEmptyString, pos, size, n, choices, wxCB_READONLY )

{

    m_layerorder   = true;

    m_layerhotkeys = true;
@@ -35,11 +34,10 @@ LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( WinEDA_Toolbar* parent, wxWindowID id, 
}





LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( WinEDA_Toolbar* parent, wxWindowID id,

LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( EDA_TOOLBAR* parent, wxWindowID id,

                                        const wxPoint& pos, const wxSize& size,

                                        const wxArrayString& choices ) :

    wxBitmapComboBox( parent, id, wxEmptyString, pos, size,

                      choices, wxCB_READONLY )

    wxBitmapComboBox( parent, id, wxEmptyString, pos, size, choices, wxCB_READONLY )

{

    m_layerorder   = true;

    m_layerhotkeys = true;

common/wineda_toolbar.cpp

+2 −3
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ 
#include "wxstruct.h"





WinEDA_Toolbar::WinEDA_Toolbar( id_toolbar type, wxWindow * parent,

                                wxWindowID id, bool horizontal ):

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 :
@@ -28,7 +27,7 @@ WinEDA_Toolbar::WinEDA_Toolbar( id_toolbar type, wxWindow * parent, 
}





int WinEDA_Toolbar::GetDimension( )

int EDA_TOOLBAR::GetDimension( )

{

    if( m_Horizontal )

        return GetSize().y;

cvpcb/class_DisplayFootprintsFrame.cpp

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ void DISPLAY_FOOTPRINTS_FRAME::ReCreateOptToolbar() 
        return;



    // Create options tool bar.

    m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );

    m_OptionsToolBar = new EDA_TOOLBAR( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, false );



    m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString, wxBitmap( grid_xpm ),

                               _( "Hide grid" ), wxITEM_CHECK );
@@ -201,7 +201,7 @@ void DISPLAY_FOOTPRINTS_FRAME::ReCreateHToolbar() 
    if( m_HToolBar != NULL )

        return;



    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );

    m_HToolBar = new EDA_TOOLBAR( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );



    m_HToolBar->AddTool( ID_OPTIONS_SETUP, wxEmptyString, wxBitmap( display_options_xpm ),

                         _( "Display options" ) );