Commit 07e5eee1 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Fixes wxSingleChoiceDialog ambiguous constructor compile bug using wxWidgets 2.9.4 or greater.

parent 6219291d

gerbview/gerbview_frame.cpp

+6 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
 * This program source code file is part of KiCad, a free EDA CAD application.

 *

 * Copyright (C) 1994 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com

 * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>

 * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.

 *

 * This program is free software; you can redistribute it and/or
@@ -457,8 +456,13 @@ void GERBVIEW_FRAME::Liste_D_Codes() 
        }

    }



    wxSingleChoiceDialog dlg( this, wxEmptyString, _( "D Codes" ), list, NULL,

#if wxCHECK_VERSION( 2, 9, 4 )

    wxSingleChoiceDialog dlg( this, wxEmptyString, _( "D Codes" ), list, (void**)NULL,

                              wxCHOICEDLG_STYLE & ~wxCANCEL );

#else

    wxSingleChoiceDialog dlg( this, wxEmptyString, _( "D Codes" ), list, (char**)NULL,

                              wxCHOICEDLG_STYLE & ~wxCANCEL );

#endif



    dlg.ShowModal();

}

pcbnew/highlight.cpp

+5 −1
Original line number Diff line number Diff line
@@ -75,7 +75,11 @@ void PCB_EDIT_FRAME::ListNetsAndSelect( wxCommandEvent& event ) 
        list.Add( Line );

    }



    wxSingleChoiceDialog choiceDlg( this, wxEmptyString, _( "Select Net" ), list, NULL );

#if wxCHECK_VERSION( 2, 9, 4 )

    wxSingleChoiceDialog choiceDlg( this, wxEmptyString, _( "Select Net" ), list, (void**) NULL );

#else

    wxSingleChoiceDialog choiceDlg( this, wxEmptyString, _( "Select Net" ), list, (char**) NULL );

#endif



    if( (choiceDlg.ShowModal() == wxID_CANCEL) || (choiceDlg.GetSelection() == wxNOT_FOUND) )

        return;