Commit b707493f authored by jean-pierre charras's avatar jean-pierre charras

Update version number

parent 63399bbe
...@@ -520,7 +520,7 @@ int S3D_MASTER::ReadGeometry( FILE* file, int* LineNum ) ...@@ -520,7 +520,7 @@ int S3D_MASTER::ReadGeometry( FILE* file, int* LineNum )
{ {
int kk = coordIndex[jj] * 3; int kk = coordIndex[jj] * 3;
if( (kk < 0) || ((kk + 3) > points.size()) ) if( (kk < 0) || ((kk + 3) > (int)points.size()) )
{ {
wxLogError( wxT( "3D geometry index read error <%s> at line %d." ), wxLogError( wxT( "3D geometry index read error <%s> at line %d." ),
GetChars( FROM_UTF8( text ) ), *LineNum ); GetChars( FROM_UTF8( text ) ), *LineNum );
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#ifndef KICAD_BUILD_VERSION #ifndef KICAD_BUILD_VERSION
#if defined KICAD_GOST #if defined KICAD_GOST
# define KICAD_BUILD_VERSION "(2011-nov-12 GOST)" # define KICAD_BUILD_VERSION "(2011-nov-26 GOST)"
#else #else
# define KICAD_BUILD_VERSION "(2011-nov-12)" # define KICAD_BUILD_VERSION "(2011-nov-26)"
#endif #endif
#endif #endif
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
; General Product Description Definitions ; General Product Description Definitions
!define PRODUCT_NAME "KiCad" !define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "2011.11.12" !define PRODUCT_VERSION "2011.11.26"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/" !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/" !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME "" !define COMPANY_NAME ""
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
*/ */
/** /**
* @file pcbnew/block.cpp * @file block.cpp
*/ */
...@@ -103,7 +103,10 @@ public: ...@@ -103,7 +103,10 @@ public:
private: private:
void ExecuteCommand( wxCommandEvent& event ); void ExecuteCommand( wxCommandEvent& event );
void OnCancel( wxCommandEvent& event ) { EndModal( -1 ); } void OnCancel( wxCommandEvent& event )
{
EndModal( wxID_CANCEL );
}
void checkBoxClicked( wxCommandEvent& aEvent ) void checkBoxClicked( wxCommandEvent& aEvent )
{ {
if( m_Include_Modules->GetValue() ) if( m_Include_Modules->GetValue() )
...@@ -116,19 +119,19 @@ private: ...@@ -116,19 +119,19 @@ private:
static bool InstallBlockCmdFrame( PCB_BASE_FRAME* parent, const wxString& title ) static bool InstallBlockCmdFrame( PCB_BASE_FRAME* parent, const wxString& title )
{ {
int nocmd;
wxPoint oldpos = parent->GetScreen()->GetCrossHairPosition(); wxPoint oldpos = parent->GetScreen()->GetCrossHairPosition();
parent->DrawPanel->m_IgnoreMouseEvents = true; parent->DrawPanel->m_IgnoreMouseEvents = true;
DIALOG_BLOCK_OPTIONS dlg( parent, title ); DIALOG_BLOCK_OPTIONS * dlg = new DIALOG_BLOCK_OPTIONS( parent, title );
nocmd = dlg.ShowModal(); int cmd = dlg->ShowModal();
dlg->Destroy();
parent->GetScreen()->SetCrossHairPosition( oldpos ); parent->GetScreen()->SetCrossHairPosition( oldpos );
parent->DrawPanel->MoveCursorToCrossHair(); parent->DrawPanel->MoveCursorToCrossHair();
parent->DrawPanel->m_IgnoreMouseEvents = false; parent->DrawPanel->m_IgnoreMouseEvents = false;
return nocmd ? false : true; return cmd == wxID_OK;
} }
...@@ -171,7 +174,7 @@ void DIALOG_BLOCK_OPTIONS::ExecuteCommand( wxCommandEvent& event ) ...@@ -171,7 +174,7 @@ void DIALOG_BLOCK_OPTIONS::ExecuteCommand( wxCommandEvent& event )
blockDrawItems = m_DrawBlockItems->GetValue(); blockDrawItems = m_DrawBlockItems->GetValue();
blockIncludeItemsOnInvisibleLayers = m_checkBoxIncludeInvisible->GetValue(); blockIncludeItemsOnInvisibleLayers = m_checkBoxIncludeInvisible->GetValue();
EndModal( 0 ); EndModal( wxID_OK );
} }
...@@ -285,7 +288,7 @@ bool PCB_EDIT_FRAME::HandleBlockEnd( wxDC* DC ) ...@@ -285,7 +288,7 @@ bool PCB_EDIT_FRAME::HandleBlockEnd( wxDC* DC )
if( !GetScreen()->m_BlockLocate.GetCount() if( !GetScreen()->m_BlockLocate.GetCount()
&& GetScreen()->m_BlockLocate.m_Command != BLOCK_ZOOM ) && GetScreen()->m_BlockLocate.m_Command != BLOCK_ZOOM )
{ {
if( !InstallBlockCmdFrame( this, _( "Block Operation" ) ) ) if( InstallBlockCmdFrame( this, _( "Block Operation" ) ) == false )
{ {
cancelCmd = true; cancelCmd = true;
......
release version: release version:
2011 nov 12 2011 nov 26
files (.zip,.tgz): files (.zip,.tgz):
kicad-2011-11-12 kicad-2011-11-26
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment