0023456: Update MFC samples for OCCT 6.5.4

Update About dialog
Update reading files in OCAF sample

diff --git a/samples/CSharp/IE/AboutDialog.cs b/samples/CSharp/IE/AboutDialog.cs
index c05231f90236d61b9546e28eb009cf67000de894..99a4002225000c2eaa03a0e8a162f172404ded43 100755 (executable)
--- a/samples/CSharp/IE/AboutDialog.cs
+++ b/samples/CSharp/IE/AboutDialog.cs
@@ -59,89 +59,92 @@ namespace IE
                /// </summary>
                private void InitializeComponent()
                {
-                       System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(AboutDialog));
-                       this.pictureBox1 = new System.Windows.Forms.PictureBox();
-                       this.button1 = new System.Windows.Forms.Button();
-                       this.label1 = new System.Windows.Forms.Label();
-                       this.myVersion = new System.Windows.Forms.Label();
-                       this.label3 = new System.Windows.Forms.Label();
-                       this.label4 = new System.Windows.Forms.Label();
-                       this.SuspendLayout();
-                       // 
-                       // pictureBox1
-                       // 
-                       this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-                       this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-                       this.pictureBox1.Location = new System.Drawing.Point(59, 64);
-                       this.pictureBox1.Name = "pictureBox1";
-                       this.pictureBox1.Size = new System.Drawing.Size(194, 100);
-                       this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-                       this.pictureBox1.TabIndex = 0;
-                       this.pictureBox1.TabStop = false;
-                       // 
-                       // button1
-                       // 
-                       this.button1.Location = new System.Drawing.Point(96, 248);
-                       this.button1.Name = "button1";
-                       this.button1.Size = new System.Drawing.Size(128, 24);
-                       this.button1.TabIndex = 1;
-                       this.button1.Text = "OK";
-                       this.button1.Click += new System.EventHandler(this.button1_Click);
-                       // 
-                       // label1
-                       // 
-                       this.label1.Location = new System.Drawing.Point(16, 16);
-                       this.label1.Name = "label1";
-                       this.label1.Size = new System.Drawing.Size(288, 24);
-                       this.label1.TabIndex = 2;
-                       this.label1.Text = "Import/Export Sample,";
-                       this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-                       // 
-                       // myVersion
-                       // 
-                       this.myVersion.Location = new System.Drawing.Point(16, 32);
-                       this.myVersion.Name = "myVersion";
-                       this.myVersion.Size = new System.Drawing.Size(288, 16);
-                       this.myVersion.TabIndex = 3;
-                       this.myVersion.Text = "Open CASCADE Technology ";
-                       this.myVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-                       // 
-                       // label3
-                       // 
-                       this.label3.Location = new System.Drawing.Point(24, 168);
-                       this.label3.Name = "label3";
-                       this.label3.Size = new System.Drawing.Size(280, 23);
-                       this.label3.TabIndex = 4;
-                       this.label3.Text = "Copyright (C) 2004, Open CASCADE SA";
-                       this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-                       // 
-                       // label4
-                       // 
-                       this.label4.Location = new System.Drawing.Point(8, 200);
-                       this.label4.Name = "label4";
-                       this.label4.Size = new System.Drawing.Size(296, 24);
-                       this.label4.TabIndex = 5;
-                       this.label4.Text = "http://opencascade.com marketing.contact@opencascade.com";
-                       this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-                       // 
-                       // AboutDialog
-                       // 
-                       this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-                       this.ClientSize = new System.Drawing.Size(312, 285);
-                       this.ControlBox = false;
-                       this.Controls.Add(this.label4);
-                       this.Controls.Add(this.label3);
-                       this.Controls.Add(this.myVersion);
-                       this.Controls.Add(this.label1);
-                       this.Controls.Add(this.button1);
-                       this.Controls.Add(this.pictureBox1);
-                       this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-                       this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-                       this.MaximizeBox = false;
-                       this.MinimizeBox = false;
-                       this.Name = "AboutDialog";
-                       this.Text = "About Import/Export Sample";
-                       this.ResumeLayout(false);
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutDialog));
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.button1 = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.myVersion = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+            this.pictureBox1.Location = new System.Drawing.Point(59, 64);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(196, 102);
+            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.pictureBox1.TabIndex = 0;
+            this.pictureBox1.TabStop = false;
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(96, 248);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(128, 24);
+            this.button1.TabIndex = 1;
+            this.button1.Text = "OK";
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // label1
+            // 
+            this.label1.Location = new System.Drawing.Point(16, 9);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(288, 24);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "Import/Export Sample,";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // myVersion
+            // 
+            this.myVersion.Location = new System.Drawing.Point(16, 32);
+            this.myVersion.Name = "myVersion";
+            this.myVersion.Size = new System.Drawing.Size(288, 16);
+            this.myVersion.TabIndex = 3;
+            this.myVersion.Text = "Open CASCADE Technology ";
+            this.myVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label3
+            // 
+            this.label3.Location = new System.Drawing.Point(24, 168);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(280, 23);
+            this.label3.TabIndex = 4;
+            this.label3.Text = "Copyright (C) 2004-2012, Open CASCADE S.A.S";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label4
+            // 
+            this.label4.Location = new System.Drawing.Point(8, 200);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(296, 24);
+            this.label4.TabIndex = 5;
+            this.label4.Text = "http://www.opencascade.com";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // AboutDialog
+            // 
+            this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+            this.ClientSize = new System.Drawing.Size(312, 285);
+            this.ControlBox = false;
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.myVersion);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.button1);
+            this.Controls.Add(this.pictureBox1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "AboutDialog";
+            this.Text = "About Import/Export Sample";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
                }
                #endregion

diff --git a/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp b/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp
index 6a106f528884272c7ffac023b3b2868ce4a7abda..5cf66eea64626ed2e3555c60720e623e67eab88b 100755 (executable)
--- a/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp
+++ b/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp
@@ -148,9 +148,10 @@ void COcafApp::OnFileOpen()
        if (aDlg.DoModal() != IDOK) 
         return;
 
-    int strLength = aDlg.GetFileName().GetLength()+1;
+
+    int strLength = aDlg.GetPathName().GetLength()+1;
        LPTSTR lpszFileName = new TCHAR[strLength];
-       strcpy_s(lpszFileName, strLength, aDlg.GetFileName());
+       strcpy_s(lpszFileName, strLength, aDlg.GetPathName() );
        
        OpenDocumentFile(lpszFileName);
 }

diff --git a/samples/mfc/standard/Common/res/OCC_Resource.rc b/samples/mfc/standard/Common/res/OCC_Resource.rc
index f878a8773ba74059b27baacceaf9282fd1bc41b4..0ac9c5240c0879ea52f5ef64a13d1452ad294629 100755 (executable)
--- a/samples/mfc/standard/Common/res/OCC_Resource.rc
+++ b/samples/mfc/standard/Common/res/OCC_Resource.rc
@@ -80,7 +80,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     CTEXT           "Sample SampleName, Open CASCADE Technology OCC_Version",
                     IDC_ABOUTBOX_TITLE,3,8,195,8
-    CTEXT           "Copyright (C) 2001-2011, Open CASCADE S.A.S",
+    CTEXT           "Copyright (C) 2001-2012, Open CASCADE S.A.S",
                     IDC_STATIC,18,99,165,8,SS_CENTERIMAGE
     DEFPUSHBUTTON   "OK",IDOK,56,135,88,14,WS_GROUP
     CTEXT           "http://www.opencascade.com",IDC_STATIC,51,115,98,8,