Commit 1d3b8714 authored by dickelbeck's avatar dickelbeck
Browse files

beautified and account for changed macros.h

parent 51fc073e

3d-viewer/3d_toolbar.cpp

+72 −68
Original line number Original line Diff line number Diff line
@@ -15,10 +15,9 @@ 








/*********************************************/

/*********************************************/

void WinEDA3D_DrawFrame::ReCreateHToolbar(void)

void WinEDA3D_DrawFrame::ReCreateHToolbar()

/*********************************************/

/*********************************************/

{

{



    if( m_HToolBar != NULL )

    if( m_HToolBar != NULL )

    {           // simple mise a jour de la liste des fichiers anciens

    {           // simple mise a jour de la liste des fichiers anciens

        SetToolbars();

        SetToolbars();
@@ -27,6 +26,7 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar(void) 








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

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



    SetToolBar( m_HToolBar );

    SetToolBar( m_HToolBar );





    // Set up toolbar

    // Set up toolbar
@@ -34,6 +34,7 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar(void) 
                        _( "Reload board" ) );

                        _( "Reload board" ) );

#ifdef __WINDOWS__  // do not work properly under linux

#ifdef __WINDOWS__  // do not work properly under linux

    m_HToolBar-> AddSeparator();

    m_HToolBar-> AddSeparator();



    m_HToolBar->AddTool( ID_TOOL_SCREENCOPY_TOCLIBBOARD, wxEmptyString, BITMAP( copy_button ),

    m_HToolBar->AddTool( ID_TOOL_SCREENCOPY_TOCLIBBOARD, wxEmptyString, BITMAP( copy_button ),

                        _( "Copy 3D Image to Clipboard" ) );

                        _( "Copy 3D Image to Clipboard" ) );

#endif

#endif
@@ -91,19 +92,22 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar(void) 
//	SetToolbars();

//	SetToolbars();

}

}







/*********************************************/

/*********************************************/

void WinEDA3D_DrawFrame::ReCreateVToolbar(void)

void WinEDA3D_DrawFrame::ReCreateVToolbar()

/*********************************************/

/*********************************************/

{

{

}

}







/**********************************************/

/**********************************************/

void WinEDA3D_DrawFrame::ReCreateMenuBar(void)

void WinEDA3D_DrawFrame::ReCreateMenuBar()

/**********************************************/

/**********************************************/

{

{

    wxMenuBar* menuBar = new wxMenuBar;

    wxMenuBar* menuBar = new wxMenuBar;





    wxMenu*    fileMenu = new wxMenu;

    wxMenu*    fileMenu = new wxMenu;



    menuBar->Append( fileMenu, _( "&File" ) );

    menuBar->Append( fileMenu, _( "&File" ) );





    fileMenu->Append( ID_MENU_SCREENCOPY_PNG, _( "Create Image (png format)" ) );

    fileMenu->Append( ID_MENU_SCREENCOPY_PNG, _( "Create Image (png format)" ) );
@@ -115,15 +119,15 @@ void WinEDA3D_DrawFrame::ReCreateMenuBar(void) 
    menuBar->Append( referencesMenu, _( "&Preferences" ) );

    menuBar->Append( referencesMenu, _( "&Preferences" ) );





    ADD_MENUITEM( referencesMenu, ID_MENU3D_BGCOLOR_SELECTION,

    ADD_MENUITEM( referencesMenu, ID_MENU3D_BGCOLOR_SELECTION,

		_("Choose background color"), palette_xpm)

                  _( "Choose background color" ), palette_xpm );









    SetMenuBar( menuBar );

    SetMenuBar( menuBar );

}

}







/*****************************************/

/*****************************************/

void WinEDA3D_DrawFrame::SetToolbars(void)

void WinEDA3D_DrawFrame::SetToolbars()

/*****************************************/

/*****************************************/

{

{

}
 
}