Commit 292c1f09 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Kicad: bug fix in menubar when changing the selected locale. 

fctsys.h: remove useless define.
Fix minor issues and add minor enhancements.
parent f3cc32f9

common/build_version.cpp

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ 


#ifndef KICAD_BUILD_VERSION

#if defined KICAD_GOST

#   define KICAD_BUILD_VERSION "(2011-nov-30 GOST)"

#   define KICAD_BUILD_VERSION "(2012-oct-18 GOST)"

#else

#   define KICAD_BUILD_VERSION "(2011-nov-30)"

#   define KICAD_BUILD_VERSION "(2012-oct-18)"

#endif

#endif

common/dialogs/dialog_display_info_HTML_base.fbp

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<wxFormBuilder_Project>

    <FileVersion major="1" minor="10" />

    <FileVersion major="1" minor="11" />

    <object class="Project" expanded="1">

        <property name="class_decoration" />

        <property name="code_generation">C++</property>

common/dialogs/dialog_get_component_base.cpp

+5 −2
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// C++ code generated with wxFormBuilder (version Apr 10 2012)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -9,7 +9,7 @@ 


///////////////////////////////////////////////////////////////////////////



DIALOG_GET_COMPONENT_BASE::DIALOG_GET_COMPONENT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )

DIALOG_GET_COMPONENT_BASE::DIALOG_GET_COMPONENT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )

{

	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
@@ -35,6 +35,7 @@ DIALOG_GET_COMPONENT_BASE::DIALOG_GET_COMPONENT_BASE( wxWindow* parent, wxWindow 
	

	bSizerLeft->Add( m_historyList, 1, wxALL|wxEXPAND, 5 );

	

	

	bSizerMain->Add( bSizerLeft, 1, wxEXPAND, 5 );

	

	wxBoxSizer* bSizerRight;
@@ -56,8 +57,10 @@ DIALOG_GET_COMPONENT_BASE::DIALOG_GET_COMPONENT_BASE( wxWindow* parent, wxWindow 
	m_buttonBrowse = new wxButton( this, ID_EXTRA_TOOL, _("Select by Browser"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizerRight->Add( m_buttonBrowse, 0, wxALL|wxEXPAND, 5 );

	

	

	bSizerMain->Add( bSizerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );

	

	

	this->SetSizer( bSizerMain );

	this->Layout();

common/dialogs/dialog_get_component_base.fbp

+292 −14

File changed.

Preview size limit exceeded, changes collapsed.

common/dialogs/dialog_get_component_base.h

+9 −7
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// C++ code generated with wxFormBuilder (version Apr 10 2012)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!

///////////////////////////////////////////////////////////////////////////



#ifndef __dialog_get_component_base__

#define __dialog_get_component_base__

#ifndef __DIALOG_GET_COMPONENT_BASE_H__

#define __DIALOG_GET_COMPONENT_BASE_H__



#include <wx/artprov.h>

#include <wx/xrc/xmlres.h>

#include <wx/intl.h>



#include "dialog_shim.h"

#include <wx/string.h>

#include <wx/stattext.h>

#include <wx/gdicmn.h>
@@ -32,7 +34,7 @@ 
///////////////////////////////////////////////////////////////////////////////

/// Class DIALOG_GET_COMPONENT_BASE

///////////////////////////////////////////////////////////////////////////////

class DIALOG_GET_COMPONENT_BASE : public wxDialog 

class DIALOG_GET_COMPONENT_BASE : public DIALOG_SHIM

{

	private:
@@ -60,4 +62,4 @@ class DIALOG_GET_COMPONENT_BASE : public wxDialog 
	

};



#endif //__dialog_get_component_base__
 
#endif //__DIALOG_GET_COMPONENT_BASE_H__