From b707493f35ddb7523e7fb74aa6b98d9809fa06e6 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Sat, 26 Nov 2011 21:02:59 +0100
Subject: [PATCH] Update version number

---
 3d-viewer/3d_read_mesh.cpp         |  2 +-
 common/build_version.cpp           |  4 ++--
 packaging/windows/nsis/install.nsi |  2 +-
 pcbnew/block.cpp                   | 19 +++++++++++--------
 version.txt                        |  4 ++--
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/3d-viewer/3d_read_mesh.cpp b/3d-viewer/3d_read_mesh.cpp
index 5163e3a1d8..bed2b50104 100644
--- a/3d-viewer/3d_read_mesh.cpp
+++ b/3d-viewer/3d_read_mesh.cpp
@@ -520,7 +520,7 @@ int S3D_MASTER::ReadGeometry( FILE* file, int* LineNum )
                         {
                             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." ),
                                             GetChars( FROM_UTF8( text ) ), *LineNum );
diff --git a/common/build_version.cpp b/common/build_version.cpp
index 1f4d5680ea..cdf4ec6cf9 100644
--- a/common/build_version.cpp
+++ b/common/build_version.cpp
@@ -7,9 +7,9 @@
 
 #ifndef KICAD_BUILD_VERSION
 #if defined KICAD_GOST
-#   define KICAD_BUILD_VERSION "(2011-nov-12 GOST)"
+#   define KICAD_BUILD_VERSION "(2011-nov-26 GOST)"
 #else
-#   define KICAD_BUILD_VERSION "(2011-nov-12)"
+#   define KICAD_BUILD_VERSION "(2011-nov-26)"
 #endif
 #endif
 
diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi
index 15d5559c46..35c9e009bd 100644
--- a/packaging/windows/nsis/install.nsi
+++ b/packaging/windows/nsis/install.nsi
@@ -17,7 +17,7 @@
 
 ; General Product Description Definitions
 !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 SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""
diff --git a/pcbnew/block.cpp b/pcbnew/block.cpp
index 63f8995493..780b44abd8 100644
--- a/pcbnew/block.cpp
+++ b/pcbnew/block.cpp
@@ -24,7 +24,7 @@
  */
 
 /**
- * @file pcbnew/block.cpp
+ * @file block.cpp
  */
 
 
@@ -103,7 +103,10 @@ public:
 
 private:
     void ExecuteCommand( wxCommandEvent& event );
-    void OnCancel( wxCommandEvent& event ) { EndModal( -1 ); }
+    void OnCancel( wxCommandEvent& event )
+    {
+        EndModal( wxID_CANCEL );
+    }
     void checkBoxClicked( wxCommandEvent& aEvent )
     {
         if( m_Include_Modules->GetValue() )
@@ -116,19 +119,19 @@ private:
 
 static bool InstallBlockCmdFrame( PCB_BASE_FRAME* parent, const wxString& title )
 {
-    int     nocmd;
     wxPoint oldpos = parent->GetScreen()->GetCrossHairPosition();
 
     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->DrawPanel->MoveCursorToCrossHair();
     parent->DrawPanel->m_IgnoreMouseEvents = false;
 
-    return nocmd ? false : true;
+    return cmd == wxID_OK;
 }
 
 
@@ -171,7 +174,7 @@ void DIALOG_BLOCK_OPTIONS::ExecuteCommand( wxCommandEvent& event )
     blockDrawItems = m_DrawBlockItems->GetValue();
     blockIncludeItemsOnInvisibleLayers = m_checkBoxIncludeInvisible->GetValue();
 
-    EndModal( 0 );
+    EndModal( wxID_OK );
 }
 
 
@@ -285,7 +288,7 @@ bool PCB_EDIT_FRAME::HandleBlockEnd( wxDC* DC )
     if( !GetScreen()->m_BlockLocate.GetCount()
         && GetScreen()->m_BlockLocate.m_Command != BLOCK_ZOOM )
     {
-        if( !InstallBlockCmdFrame( this, _( "Block Operation" ) ) )
+        if( InstallBlockCmdFrame( this, _( "Block Operation" ) ) == false )
         {
             cancelCmd = true;
 
diff --git a/version.txt b/version.txt
index 06da3e7b64..ab67d861a6 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 release version:
-2011 nov 12
+2011 nov 26
 files (.zip,.tgz):
-kicad-2011-11-12
+kicad-2011-11-26