Commit e85cf2e0 authored by charras's avatar charras
Browse files

Pcbnew, fixed (I hope) a Linux specific issue: 

* For an obscure reason the focus is lost after loading a board file when starting Pcbnew
* (i.e. only when launching Pcbnew from Kicad or from a command line, with a board filename to load))
* (seems due to the recreation of the layer manager after loading the file)
* This is more a workaround than a fix.
parent bbd8cdd9

pcbnew/pcbnew.cpp

+44 −27
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "drag.h"

#include "drag.h"

#include "eda_dde.h"

#include "eda_dde.h"

#include "colors_selection.h"

#include "colors_selection.h"

#include "class_drawpanel.h"





#include "id.h"

#include "id.h"
@@ -62,7 +63,8 @@ wxPoint g_Offset_Module; /* Offset de trace du modul en depl */ 
wxString               g_Current_PadName;   // Last used pad name (pad num)

wxString               g_Current_PadName;   // Last used pad name (pad num)





// Wildcard for footprint libraries filesnames

// Wildcard for footprint libraries filesnames

const wxString g_FootprintLibFileWildcard( wxT( "Kicad footprint library file (*.mod)|*.mod" ) );

const wxString         g_FootprintLibFileWildcard( wxT(

                                                      "Kicad footprint library file (*.mod)|*.mod" ) );





/* Name of the document footprint list

/* Name of the document footprint list

 * usually located in share/modules/footprints_doc

 * usually located in share/modules/footprints_doc
@@ -76,7 +78,8 @@ IMPLEMENT_APP( WinEDA_App ) 
/* MacOSX: Needed for file association

/* MacOSX: Needed for file association

 * http://wiki.wxwidgets.org/WxMac-specific_topics

 * http://wiki.wxwidgets.org/WxMac-specific_topics

 */

 */

void WinEDA_App::MacOpenFile(const wxString &fileName) {

void WinEDA_App::MacOpenFile( const wxString& fileName )

{

    wxFileName       filename = fileName;

    wxFileName       filename = fileName;

    WinEDA_PcbFrame* frame    = ( (WinEDA_PcbFrame*) GetTopWindow() );

    WinEDA_PcbFrame* frame    = ( (WinEDA_PcbFrame*) GetTopWindow() );
@@ -93,6 +96,7 @@ bool WinEDA_App::OnInit() 
{

{

    /* WXMAC application specific */

    /* WXMAC application specific */

#ifdef __WXMAC__

#ifdef __WXMAC__



//	wxApp::SetExitOnFrameDelete(false);

//	wxApp::SetExitOnFrameDelete(false);

//	wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;

//	wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;

    wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP;

    wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP;
@@ -122,7 +126,8 @@ bool WinEDA_App::OnInit() 




        if( fn.GetExt() != BoardFileExtension )

        if( fn.GetExt() != BoardFileExtension )

        {

        {

            wxLogDebug( wxT( "PcbNew file <%s> has the wrong extension.\

            wxLogDebug( wxT(

                           "PcbNew file <%s> has the wrong extension.\

Changing extension to .brd."                                                                         ),

Changing extension to .brd."                                                                         ),

                       GetChars( fn.GetFullPath() ) );

                       GetChars( fn.GetFullPath() ) );

            fn.SetExt( BoardFileExtension );

            fn.SetExt( BoardFileExtension );
@@ -160,9 +165,21 @@ Changing extension to .brd." ), 
    if( fn.IsOk() )

    if( fn.IsOk() )

    {

    {

        frame->LoadOnePcbFile( fn.GetFullPath(), FALSE );

        frame->LoadOnePcbFile( fn.GetFullPath(), FALSE );



        // update the layer names in the listbox

        // update the layer names in the listbox

        frame->ReCreateLayerBox( NULL );

        frame->ReCreateLayerBox( NULL );

    }

    }





    /* For an obscure reason the focus is lost after loading a board file

     * when starting (i.e. only at this point)

     * (seems due to the recreation of the layer manager after loading the file)

     * give focus to main window and Drawpanel

     * must be done for these 2 windows (for an obscure reason ...)

     * Linux specific

     * This is more a workaround than a fix.

     */

    frame->SetFocus();

    frame->DrawPanel->SetFocus();



    return true;

    return true;

}
 
}