Commit 141d5b5f authored by jean-pierre charras's avatar jean-pierre charras
Browse files

fixed somes issues with wxWidgets 2.9.1

parent 68d652cd

common/selcolor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ void WinEDA_SelColorFrame::Init_Dialog( int aOldColor ) 
        iconDC.DrawRoundedRectangle( 0, 0, w, h, (double) h / 3 );



        BitmapButton = new wxBitmapButton( this, butt_ID, ButtBitmap,

                                           wxDefaultPosition, wxSize( w, h ) );

                                           wxDefaultPosition, wxSize( w+8, h+6 ) );

        FlexColumnBoxSizer->Add( BitmapButton, 0,

                                 wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL |

                                 wxLEFT | wxBOTTOM, 5 );

eeschema/eelayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ void WinEDA_SetColorsFrame::CreateControls() 


        BitmapButton =

            new wxBitmapButton( this, butt_ID, ButtBitmap, wxDefaultPosition,

                                wxSize( BUTT_SIZE_X, BUTT_SIZE_Y ) );

                                wxSize( BUTT_SIZE_X+8, BUTT_SIZE_Y+6 ) );

        RowBoxSizer->Add( BitmapButton,

                          0,

                          wxALIGN_CENTER_VERTICAL | wxRIGHT | wxBOTTOM,

eeschema/eelayer.h

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ enum col_sel_id { 
#endif



// Specify the width and height of every (color-displaying / bitmap) button

const int BUTT_SIZE_X = 30;

const int BUTT_SIZE_Y = 20;

const int BUTT_SIZE_X = 16;

const int BUTT_SIZE_Y = 16;



// Macro utile :

#define ADR( numlayer ) & (g_LayerDescr.LayerColor[numlayer])

gerbview/gerberframe.cpp

+32 −27
Original line number Diff line number Diff line
@@ -131,10 +131,13 @@ WinEDA_GerberFrame::WinEDA_GerberFrame( wxWindow* father, 
    m_show_layer_manager_tools = true;



    m_Draw_Axis = true;         // true to show X and Y axis on screen

    m_Draw_Sheet_Ref = FALSE;   // TRUE for reference drawings.

    m_Draw_Sheet_Ref = false;   // true for reference drawings.

    m_HotkeysZoomAndGridList = s_Gerbview_Hokeys_Descr;

    m_SelLayerBox = NULL;

    m_SelLayerTool = NULL;



    if( DrawPanel )

        DrawPanel->m_Block_Enable = TRUE;

        DrawPanel->m_Block_Enable = true;



    // Give an icon

#ifdef __WINDOWS__
@@ -238,7 +241,8 @@ void WinEDA_GerberFrame::OnCloseWindow( wxCloseEvent& Event ) 
 */

void WinEDA_GerberFrame::SetToolbars()

{

    int     layer  = ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer;

    PCB_SCREEN* screen = (PCB_SCREEN*) GetScreen();

    int     layer  = screen->m_Active_Layer;

    GERBER* gerber = g_GERBER_List[layer];



    if( m_HToolBar == NULL )
@@ -246,26 +250,26 @@ void WinEDA_GerberFrame::SetToolbars() 


    if( GetScreen()->m_BlockLocate.m_Command == BLOCK_MOVE )

    {

        m_HToolBar->EnableTool( wxID_CUT, TRUE );

        m_HToolBar->EnableTool( wxID_COPY, TRUE );

        m_HToolBar->EnableTool( wxID_CUT, true );

        m_HToolBar->EnableTool( wxID_COPY, true );

    }

    else

    {

        m_HToolBar->EnableTool( wxID_CUT, FALSE );

        m_HToolBar->EnableTool( wxID_COPY, FALSE );

        m_HToolBar->EnableTool( wxID_CUT, false );

        m_HToolBar->EnableTool( wxID_COPY, false );

    }



    if( m_SelLayerBox->GetSelection() !=

        ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer )

    if(  m_SelLayerBox && (m_SelLayerBox->GetSelection() != screen->m_Active_Layer) )

    {

        m_SelLayerBox->SetSelection(

            ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer );

        m_SelLayerBox->SetSelection( screen->m_Active_Layer );

    }



    if( m_SelLayerTool )

    {

        if( gerber )

        {

            int sel_index;

        m_SelLayerTool->Enable( TRUE );

            m_SelLayerTool->Enable( true );

            if( gerber->m_Selected_Tool < FIRST_DCODE )  // No tool selected

                sel_index = 0;

            else
@@ -279,7 +283,8 @@ void WinEDA_GerberFrame::SetToolbars() 
        else

        {

            m_SelLayerTool->SetSelection( 0 );

        m_SelLayerTool->Enable( FALSE );

            m_SelLayerTool->Enable( false );

        }

    }



    if( m_OptionsToolBar )
@@ -287,9 +292,9 @@ void WinEDA_GerberFrame::SetToolbars() 
        m_OptionsToolBar->ToggleTool(

            ID_TB_OPTIONS_SELECT_UNIT_MM,

            g_UserUnit ==

            MILLIMETRES ? TRUE : FALSE );

            MILLIMETRES ? true : false );

        m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SELECT_UNIT_INCH,

                                      g_UserUnit == INCHES ? TRUE : FALSE );

                                      g_UserUnit == INCHES ? true : false );



        m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_POLAR_COORD,

                                      DisplayOpt.DisplayPolarCood );

gerbview/gerbview.cpp

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ bool WinEDA_App::OnInit() 
                                          * main frame in order to display the

                                          * real hotkeys in menus or tool tips

                                          */



    frame = new  WinEDA_GerberFrame( NULL, wxT( "GerbView" ),

                                     wxPoint( 0, 0 ),

                                     wxSize( 600, 400 ) );