Commit 750f84c1 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Coding style policy fixes and dead code removal.

parent ebc7259a

3d-viewer/3d_aux.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -175,7 +175,7 @@ Info_3D_Visu::~Info_3D_Visu() 
 * units */

 * units */

WinEDA_VertexCtrl::WinEDA_VertexCtrl( wxWindow* parent, const wxString& title,

WinEDA_VertexCtrl::WinEDA_VertexCtrl( wxWindow* parent, const wxString& title,

                                      wxBoxSizer* BoxSizer,

                                      wxBoxSizer* BoxSizer,

                                      UserUnitType units, int internal_unit )

                                      EDA_UNITS_T units, int internal_unit )

{

{

    wxString      text;

    wxString      text;

    wxStaticText* msgtitle;

    wxStaticText* msgtitle;

3d-viewer/3d_struct.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ private: 




public:

public:

    WinEDA_VertexCtrl( wxWindow* parent, const wxString& title,

    WinEDA_VertexCtrl( wxWindow* parent, const wxString& title,

                       wxBoxSizer* BoxSizer, UserUnitType units, int internal_unit );

                       wxBoxSizer* BoxSizer, EDA_UNITS_T units, int internal_unit );





    ~WinEDA_VertexCtrl();

    ~WinEDA_VertexCtrl();

common/base_screen.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -334,7 +334,7 @@ void BASE_SCREEN::AddGrid( const wxRealPoint& size, int id ) 
}

}









void BASE_SCREEN::AddGrid( const wxRealPoint& size, UserUnitType aUnit, int id )

void BASE_SCREEN::AddGrid( const wxRealPoint& size, EDA_UNITS_T aUnit, int id )

{

{

    double x, y;

    double x, y;

    wxRealPoint new_size;

    wxRealPoint new_size;

common/common.cpp

+9 −9
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ wxString g_Prj_Default_Config_FullFilename; 
wxString       g_Prj_Config_LocalFilename;

wxString       g_Prj_Config_LocalFilename;





/* Current user unit of measure */

/* Current user unit of measure */

UserUnitType   g_UserUnit;

EDA_UNITS_T    g_UserUnit;





/* Draw color for moving objects: */

/* Draw color for moving objects: */

int            g_GhostColor;

int            g_GhostColor;
@@ -221,7 +221,7 @@ Ki_PageDescr::Ki_PageDescr( const wxSize& size, 
}

}









wxString ReturnUnitSymbol( UserUnitType aUnit, const wxString& formatString )

wxString ReturnUnitSymbol( EDA_UNITS_T aUnit, const wxString& formatString )

{

{

    wxString tmp;

    wxString tmp;

    wxString label;

    wxString label;
@@ -249,7 +249,7 @@ wxString ReturnUnitSymbol( UserUnitType aUnit, const wxString& formatString ) 
}

}









wxString GetUnitsLabel( UserUnitType aUnit )

wxString GetUnitsLabel( EDA_UNITS_T aUnit )

{

{

    wxString label;

    wxString label;
@@ -272,7 +272,7 @@ wxString GetUnitsLabel( UserUnitType aUnit ) 
}

}









wxString GetAbbreviatedUnitsLabel( UserUnitType aUnit )

wxString GetAbbreviatedUnitsLabel( EDA_UNITS_T aUnit )

{

{

    wxString label;

    wxString label;
@@ -298,7 +298,7 @@ wxString GetAbbreviatedUnitsLabel( UserUnitType aUnit ) 
 * Add string "  (mm):" or " ("):" to the static text Stext.

 * Add string "  (mm):" or " ("):" to the static text Stext.

 *  Used in dialog boxes for entering values depending on selected units

 *  Used in dialog boxes for entering values depending on selected units

 */

 */

void AddUnitSymbol( wxStaticText& Stext, UserUnitType aUnit )

void AddUnitSymbol( wxStaticText& Stext, EDA_UNITS_T aUnit )

{

{

    wxString msg = Stext.GetLabel();

    wxString msg = Stext.GetLabel();
@@ -346,7 +346,7 @@ int ReturnValueFromTextCtrl( const wxTextCtrl& TextCtr, int Internal_Unit ) 
 * @return a wxString what contains value and optionally the symbol unit

 * @return a wxString what contains value and optionally the symbol unit

 *         (like 2.000 mm)

 *         (like 2.000 mm)

 */

 */

wxString ReturnStringFromValue( UserUnitType aUnit, int aValue, int aInternal_Unit,

wxString ReturnStringFromValue( EDA_UNITS_T aUnit, int aValue, int aInternal_Unit,

                                bool aAdd_unit_symbol )

                                bool aAdd_unit_symbol )

{

{

    wxString StringValue;

    wxString StringValue;
@@ -384,7 +384,7 @@ wxString ReturnStringFromValue( UserUnitType aUnit, int aValue, int aInternal_Un 
 *  Value = text

 *  Value = text

 *  Internal_Unit = units per inch for computed value

 *  Internal_Unit = units per inch for computed value

 */

 */

int ReturnValueFromString( UserUnitType aUnit, const wxString& TextValue,

int ReturnValueFromString( EDA_UNITS_T aUnit, const wxString& TextValue,

                           int Internal_Unit )

                           int Internal_Unit )

{

{

    int    Value;

    int    Value;
@@ -479,7 +479,7 @@ wxArrayString* wxStringSplit( wxString txt, wxChar splitter ) 
 * @param val : double : the given value

 * @param val : double : the given value

 * @param internal_unit_value = internal units per inch

 * @param internal_unit_value = internal units per inch

 */

 */

double To_User_Unit( UserUnitType aUnit, double val, int internal_unit_value )

double To_User_Unit( EDA_UNITS_T aUnit, double val, int internal_unit_value )

{

{

    switch( aUnit )

    switch( aUnit )

    {

    {
@@ -498,7 +498,7 @@ double To_User_Unit( UserUnitType aUnit, double val, int internal_unit_value ) 
/*

/*

 * Return in internal units the value "val" given in inch or mm

 * Return in internal units the value "val" given in inch or mm

 */

 */

int From_User_Unit( UserUnitType aUnit, double val, int internal_unit_value )

int From_User_Unit( EDA_UNITS_T aUnit, double val, int internal_unit_value )

{

{

    double value;

    double value;

common/displlst.cpp

+27 −25
Original line number Original line Diff line number Diff line
@@ -16,14 +16,14 @@ enum listbox { 
};

};









BEGIN_EVENT_TABLE( WinEDAListBox, wxDialog )

BEGIN_EVENT_TABLE( EDA_LIST_DIALOG, wxDialog )

    EVT_BUTTON( wxID_OK, WinEDAListBox::OnOkClick )

    EVT_BUTTON( wxID_OK, EDA_LIST_DIALOG::OnOkClick )

    EVT_BUTTON( wxID_CANCEL, WinEDAListBox::OnCancelClick )

    EVT_BUTTON( wxID_CANCEL, EDA_LIST_DIALOG::OnCancelClick )

    EVT_LISTBOX( ID_LISTBOX_LIST, WinEDAListBox::ClickOnList )

    EVT_LISTBOX( ID_LISTBOX_LIST, EDA_LIST_DIALOG::ClickOnList )

    EVT_LISTBOX_DCLICK( ID_LISTBOX_LIST, WinEDAListBox::D_ClickOnList )

    EVT_LISTBOX_DCLICK( ID_LISTBOX_LIST, EDA_LIST_DIALOG::D_ClickOnList )

    EVT_CHAR( WinEDAListBox::OnKeyEvent )

    EVT_CHAR( EDA_LIST_DIALOG::OnKeyEvent )

    EVT_CHAR_HOOK( WinEDAListBox::OnKeyEvent )

    EVT_CHAR_HOOK( EDA_LIST_DIALOG::OnKeyEvent )

    EVT_CLOSE( WinEDAListBox::OnClose )

    EVT_CLOSE( EDA_LIST_DIALOG::OnClose )

END_EVENT_TABLE()

END_EVENT_TABLE()
@@ -37,7 +37,7 @@ END_EVENT_TABLE() 
 * @param aCallBackFunction callback function to display comments

 * @param aCallBackFunction callback function to display comments

 * @param aPos = position of the dialog.

 * @param aPos = position of the dialog.

 */

 */

WinEDAListBox::WinEDAListBox( EDA_DRAW_FRAME* aParent, const wxString& aTitle,

EDA_LIST_DIALOG::EDA_LIST_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aTitle,

                                  const wxArrayString& aItemList, const wxString& aRefText,

                                  const wxArrayString& aItemList, const wxString& aRefText,

                                  void(* aCallBackFunction)(wxString& Text), wxPoint aPos ) :

                                  void(* aCallBackFunction)(wxString& Text), wxPoint aPos ) :

    wxDialog( aParent, wxID_ANY, aTitle, aPos, wxDefaultSize,

    wxDialog( aParent, wxID_ANY, aTitle, aPos, wxDefaultSize,
@@ -78,12 +78,12 @@ WinEDAListBox::WinEDAListBox( EDA_DRAW_FRAME* aParent, const wxString& aTitle, 
}

}









WinEDAListBox::~WinEDAListBox()

EDA_LIST_DIALOG::~EDA_LIST_DIALOG()

{

{

}

}









void WinEDAListBox::MoveMouseToOrigin()

void EDA_LIST_DIALOG::MoveMouseToOrigin()

{

{

    int    x, y, w, h;

    int    x, y, w, h;

    wxSize list_size = m_listBox->GetSize();

    wxSize list_size = m_listBox->GetSize();
@@ -96,32 +96,32 @@ void WinEDAListBox::MoveMouseToOrigin() 
}

}









wxString WinEDAListBox::GetTextSelection()

wxString EDA_LIST_DIALOG::GetTextSelection()

{

{

    wxString text = m_listBox->GetStringSelection();

    wxString text = m_listBox->GetStringSelection();

    return text;

    return text;

}

}









void WinEDAListBox::Append( const wxString& item )

void EDA_LIST_DIALOG::Append( const wxString& item )

{

{

    m_listBox->Append( item );

    m_listBox->Append( item );

}

}









void WinEDAListBox::InsertItems( const wxArrayString& itemlist, int position )

void EDA_LIST_DIALOG::InsertItems( const wxArrayString& itemlist, int position )

{

{

    m_listBox->InsertItems( itemlist, position );

    m_listBox->InsertItems( itemlist, position );

}

}









void WinEDAListBox::OnCancelClick( wxCommandEvent& event )

void EDA_LIST_DIALOG::OnCancelClick( wxCommandEvent& event )

{

{

    EndModal( wxID_CANCEL );

    EndModal( wxID_CANCEL );

}

}









void WinEDAListBox::ClickOnList( wxCommandEvent& event )

void EDA_LIST_DIALOG::ClickOnList( wxCommandEvent& event )

{

{

    wxString text;

    wxString text;
@@ -135,19 +135,19 @@ void WinEDAListBox::ClickOnList( wxCommandEvent& event ) 
}

}









void WinEDAListBox::D_ClickOnList( wxCommandEvent& event )

void EDA_LIST_DIALOG::D_ClickOnList( wxCommandEvent& event )

{

{

    EndModal( wxID_OK );

    EndModal( wxID_OK );

}

}









void WinEDAListBox::OnOkClick( wxCommandEvent& event )

void EDA_LIST_DIALOG::OnOkClick( wxCommandEvent& event )

{

{

    EndModal( wxID_OK );

    EndModal( wxID_OK );

}

}









void WinEDAListBox::OnClose( wxCloseEvent& event )

void EDA_LIST_DIALOG::OnClose( wxCloseEvent& event )

{

{

    EndModal( wxID_CANCEL );

    EndModal( wxID_CANCEL );

}

}
@@ -161,7 +161,7 @@ static int SortItems( const wxString** ptr1, const wxString** ptr2 ) 
}

}









void WinEDAListBox:: SortList()

void EDA_LIST_DIALOG:: SortList()

{

{

    int ii, NbItems = m_listBox->GetCount();

    int ii, NbItems = m_listBox->GetCount();

    const wxString** BufList;

    const wxString** BufList;
@@ -170,6 +170,7 @@ void WinEDAListBox:: SortList() 
        return;

        return;





    BufList = (const wxString**) MyZMalloc( 100 * NbItems * sizeof(wxString*) );

    BufList = (const wxString**) MyZMalloc( 100 * NbItems * sizeof(wxString*) );



    for( ii = 0; ii < NbItems; ii++ )

    for( ii = 0; ii < NbItems; ii++ )

    {

    {

        BufList[ii] = new wxString( m_listBox->GetString( ii ) );

        BufList[ii] = new wxString( m_listBox->GetString( ii ) );
@@ -179,6 +180,7 @@ void WinEDAListBox:: SortList() 
           ( int( * ) ( const void*, const void* ) )SortItems );

           ( int( * ) ( const void*, const void* ) )SortItems );





    m_listBox->Clear();

    m_listBox->Clear();



    for( ii = 0; ii < NbItems; ii++ )

    for( ii = 0; ii < NbItems; ii++ )

    {

    {

        m_listBox->Append( *BufList[ii] );

        m_listBox->Append( *BufList[ii] );
@@ -189,7 +191,7 @@ void WinEDAListBox:: SortList() 
}

}









void WinEDAListBox::OnKeyEvent( wxKeyEvent& event )

void EDA_LIST_DIALOG::OnKeyEvent( wxKeyEvent& event )

{

{

    event.Skip();

    event.Skip();

}
 
}