diff --git a/.gitignore b/.gitignore
index 259148f..1ee5385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,362 @@
-# Prerequisites
-*.d
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-# Compiled Object files
-*.slo
-*.lo
-*.o
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
*.obj
-
-# Precompiled Headers
-*.gch
+*.iobj
*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
+# Chutzpah Test files
+_Chutzpah*
-# Fortran module files
-*.mod
-*.smod
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
-# Executables
-*.exe
-*.out
-*.app
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
diff --git a/WindowsFormsApplication1/.vs/WindowsFormsApplication1/v16/.suo b/WindowsFormsApplication1/.vs/WindowsFormsApplication1/v16/.suo
index beb2b32..7753833 100644
Binary files a/WindowsFormsApplication1/.vs/WindowsFormsApplication1/v16/.suo and b/WindowsFormsApplication1/.vs/WindowsFormsApplication1/v16/.suo differ
diff --git a/WindowsFormsApplication1/WindowsFormsApplication1/CompileForm.cs b/WindowsFormsApplication1/WindowsFormsApplication1/CompileForm.cs
index ec55bff..6d8f92c 100644
--- a/WindowsFormsApplication1/WindowsFormsApplication1/CompileForm.cs
+++ b/WindowsFormsApplication1/WindowsFormsApplication1/CompileForm.cs
@@ -2,6 +2,7 @@
using System.Diagnostics;
using System.IO;
using System.Text;
+using System.Threading;
using System.Windows.Forms;
namespace WindowsFormsApplication1
@@ -47,29 +48,7 @@ namespace WindowsFormsApplication1
textBox2.Text += ("Компиляция " + codeFilename + " в " +
Path.GetFileNameWithoutExtension(codeFilename) + ".exe с помощью " +
mingwDir + "\\bin\\mingw32-g++.exe:" + Environment.NewLine + Environment.NewLine);
-
- Process mingwp = new Process();
- mingwp.StartInfo = new ProcessStartInfo()
- {
- FileName = mingwDir + "\\bin\\mingw32-g++.exe",
- Arguments = codeFilename + " -o " + Path.GetDirectoryName(codeFilename) + "\\" +
- Path.GetFileNameWithoutExtension(codeFilename) + ".exe",
- UseShellExecute = false,
- WindowStyle = ProcessWindowStyle.Hidden,
- StandardOutputEncoding = Encoding.GetEncoding(866),
- StandardErrorEncoding = Encoding.GetEncoding(866),
- CreateNoWindow = true,
- RedirectStandardOutput = true,
- RedirectStandardError = true
- };
- mingwp.OutputDataReceived += new DataReceivedEventHandler(CompilerOutputHandler);
- mingwp.ErrorDataReceived += new DataReceivedEventHandler(CompilerOutputHandler);
- mingwp.Start();
- mingwp.BeginOutputReadLine();
- mingwp.BeginErrorReadLine();
- mingwp.WaitForExit(10000);
-
- _ = MessageBox.Show("Готово!");
+ new Thread(new ThreadStart(CompilingFunction)).Start();
}
catch (Exception ex)
{
@@ -83,9 +62,34 @@ namespace WindowsFormsApplication1
}
}
+ private void CompilingFunction()
+ {
+ Process mingwp = new Process();
+ mingwp.StartInfo = new ProcessStartInfo()
+ {
+ FileName = mingwDir + "\\bin\\mingw32-g++.exe",
+ Arguments = codeFilename + " -o " + Path.GetDirectoryName(codeFilename) + "\\" +
+ Path.GetFileNameWithoutExtension(codeFilename) + ".exe",
+ UseShellExecute = false,
+ WindowStyle = ProcessWindowStyle.Hidden,
+ StandardOutputEncoding = Encoding.GetEncoding(866),
+ StandardErrorEncoding = Encoding.GetEncoding(866),
+ CreateNoWindow = true,
+ RedirectStandardOutput = true,
+ RedirectStandardError = true
+ };
+ mingwp.OutputDataReceived += new DataReceivedEventHandler(CompilerOutputHandler);
+ mingwp.ErrorDataReceived += new DataReceivedEventHandler(CompilerOutputHandler);
+ mingwp.Start();
+ mingwp.BeginOutputReadLine();
+ mingwp.BeginErrorReadLine();
+ mingwp.WaitForExit(20000);
+ textBox2.Invoke(new Action(() => { textBox2.AppendText("Готово!" + Environment.NewLine); }));
+ }
+
private void CompilerOutputHandler(object sendingProcess, DataReceivedEventArgs outputLine)
{
- textBox2.Invoke(new Action(() => { textBox2.Text += (outputLine.Data + Environment.NewLine); }));
+ textBox2.Invoke(new Action(() => { textBox2.AppendText(outputLine.Data + Environment.NewLine); }));
}
}
}
diff --git a/WindowsFormsApplication1/WindowsFormsApplication1/MainForm.cs b/WindowsFormsApplication1/WindowsFormsApplication1/MainForm.cs
index 73f8d48..9039333 100644
--- a/WindowsFormsApplication1/WindowsFormsApplication1/MainForm.cs
+++ b/WindowsFormsApplication1/WindowsFormsApplication1/MainForm.cs
@@ -239,78 +239,86 @@ namespace WindowsFormsApplication1
if (saveFileDialog1.ShowDialog() == DialogResult.OK)
{
- mainFilename = saveFileDialog1.FileName;
-
- //Adding TXLibrary and pictures
- File.Copy("TXLib.h", Path.GetDirectoryName(mainFilename) + "\\TXLib.h", true);
- string dir_path = Path.GetDirectoryName(mainFilename) + "\\Pictures";
- if (!Directory.Exists(dir_path))
+ try
{
- Directory.CreateDirectory(dir_path);
- }
+ mainFilename = saveFileDialog1.FileName;
- if (addressBackground != dir_path + "\\" + Path.GetFileName(addressBackground))
- {
- File.Copy(addressBackground, dir_path + "\\" + Path.GetFileName(addressBackground), true);
- }
-
- Files.CreateStruct(mainFilename);
- Files.OpenMain(mainFilename, PictureBoxBackground, addressBackground);
-
- for (int nomer = 0; nomer < nomerPersa; nomer++)
- {
- File.Copy(persons[nomer].address, dir_path + "\\" + Path.GetFileName(persons[nomer].address), true);
+ //Adding TXLibrary and pictures
+ File.WriteAllText(Path.GetDirectoryName(mainFilename) + "\\TXLib.h", Properties.Resources.TXLib);
+ string dir_path = Path.GetDirectoryName(mainFilename) + "\\Pictures";
+ if (!Directory.Exists(dir_path))
+ {
+ Directory.CreateDirectory(dir_path);
+ }
- if (dir_path == dir_path + "\\" + Path.GetFileName(persons[nomer].address))
+ if (addressBackground != dir_path + "\\" + Path.GetFileName(addressBackground))
+ {
+ File.Copy(addressBackground, dir_path + "\\" + Path.GetFileName(addressBackground), true);
+ }
+
+ Files.CreateStruct(mainFilename);
+ Files.OpenMain(mainFilename, PictureBoxBackground, addressBackground);
+
+ for (int nomer = 0; nomer < nomerPersa; nomer++)
{
File.Copy(persons[nomer].address, dir_path + "\\" + Path.GetFileName(persons[nomer].address), true);
+
+ if (dir_path == dir_path + "\\" + Path.GetFileName(persons[nomer].address))
+ {
+ File.Copy(persons[nomer].address, dir_path + "\\" + Path.GetFileName(persons[nomer].address), true);
+ }
+
+ if (persons[nomer].moveside == "Прямо")
+ {
+ Line.CreatePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
+ }
+ else if (persons[nomer].moveside == "Волнами")
+ {
+ Sinus.CreatePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
+ }
+ else if (persons[nomer].moveside == "Кругами")
+ {
+ Circle.CreatePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
+ }
+ else if (persons[nomer].moveside == "Диагонально")
+ {
+ Line.CreatePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
+ }
}
- if (persons[nomer].moveside == "Прямо")
+ Files.OpenWhile(mainFilename, maxTime);
+
+ for (int nomer = 0; nomer < nomerPersa; nomer++)
{
- Line.CreatePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
- }
- else if (persons[nomer].moveside == "Волнами")
- {
- Sinus.CreatePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
- }
- else if (persons[nomer].moveside == "Кругами")
- {
- Circle.CreatePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
- }
- else if (persons[nomer].moveside == "Диагонально")
- {
- Line.CreatePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
+ if (persons[nomer].moveside == "Прямо")
+ {
+ Line.MovePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
+ }
+ else if (persons[nomer].moveside == "Волнами")
+ {
+ Sinus.MovePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
+ }
+ else if (persons[nomer].moveside == "Кругами")
+ {
+ Circle.MovePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
+ }
+ else if (persons[nomer].moveside == "Диагонально")
+ {
+ Line.MovePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
+ }
}
+
+ Files.CloseWhile(mainFilename);
+ DeletePics(mainFilename, nomerPersa);
+ Files.Ending(mainFilename, checkBox1.Checked);
+
+ MessageBox.Show("Готово!");
}
-
- Files.OpenWhile(mainFilename, maxTime);
-
- for (int nomer = 0; nomer < nomerPersa; nomer++)
+ catch (Exception ex)
{
- if (persons[nomer].moveside == "Прямо")
- {
- Line.MovePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
- }
- else if (persons[nomer].moveside == "Волнами")
- {
- Sinus.MovePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
- }
- else if (persons[nomer].moveside == "Кругами")
- {
- Circle.MovePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
- }
- else if (persons[nomer].moveside == "Диагонально")
- {
- Line.MovePerson(mainFilename, Person.PersonName(nomer), persons[nomer]);
- }
+ _ = MessageBox.Show("Произошла ошибка!\n" + ex.Message, "Ошибка",
+ MessageBoxButtons.OK, MessageBoxIcon.Error);
}
-
- Files.CloseWhile(mainFilename);
- DeletePics(mainFilename, nomerPersa);
- Files.Ending(mainFilename, checkBox1.Checked);
-
- MessageBox.Show("Готово!");
}
}
@@ -344,11 +352,11 @@ namespace WindowsFormsApplication1
private void Char_Info_Click(object sender, EventArgs e)
{
- this.leftPanel.Controls.Remove(persons[nomerPersa - 1].l1);
- this.leftPanel.Controls.Remove(persons[nomerPersa - 1].l2);
- this.leftPanel.Controls.Remove(persons[nomerPersa - 1].l3);
- this.leftPanel.Controls.Remove(persons[nomerPersa - 1].b1);
- this.leftPanel.Controls.Remove(persons[nomerPersa - 1].b2);
+ leftPanel.Controls.Remove(persons[nomerPersa - 1].l1);
+ leftPanel.Controls.Remove(persons[nomerPersa - 1].l2);
+ leftPanel.Controls.Remove(persons[nomerPersa - 1].l3);
+ leftPanel.Controls.Remove(persons[nomerPersa - 1].b1);
+ leftPanel.Controls.Remove(persons[nomerPersa - 1].b2);
nomerPersa--;
yPersa -= 30;
}
diff --git a/WindowsFormsApplication1/WindowsFormsApplication1/Pictures/KOT.jpg b/WindowsFormsApplication1/WindowsFormsApplication1/Pictures/KOT.jpg
deleted file mode 100644
index ae67eb7..0000000
Binary files a/WindowsFormsApplication1/WindowsFormsApplication1/Pictures/KOT.jpg and /dev/null differ
diff --git a/WindowsFormsApplication1/WindowsFormsApplication1/bin/Debug/kartinka.bmp b/WindowsFormsApplication1/WindowsFormsApplication1/Pictures/cat.bmp
similarity index 66%
rename from WindowsFormsApplication1/WindowsFormsApplication1/bin/Debug/kartinka.bmp
rename to WindowsFormsApplication1/WindowsFormsApplication1/Pictures/cat.bmp
index 3ca76a0..24731f3 100644
Binary files a/WindowsFormsApplication1/WindowsFormsApplication1/bin/Debug/kartinka.bmp and b/WindowsFormsApplication1/WindowsFormsApplication1/Pictures/cat.bmp differ
diff --git a/WindowsFormsApplication1/WindowsFormsApplication1/Properties/Resources.Designer.cs b/WindowsFormsApplication1/WindowsFormsApplication1/Properties/Resources.Designer.cs
index bb5f151..f44f974 100644
--- a/WindowsFormsApplication1/WindowsFormsApplication1/Properties/Resources.Designer.cs
+++ b/WindowsFormsApplication1/WindowsFormsApplication1/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace WindowsFormsApplication1.Properties {
// с помощью такого средства, как ResGen или Visual Studio.
// Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
// с параметром /str или перестройте свой проект VS.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -59,5 +59,20 @@ namespace WindowsFormsApplication1.Properties {
resourceCulture = value;
}
}
+
+ ///
+ /// Ищет локализованную строку, похожую на //=================================================================================================================
+ ///// [These sections are for folding control in Code::Blocks]
+ /////{ [Best viewed with "Fold all on file open" option enabled] [best screen width is 115 chars]
+ /////=================================================================================================================
+ /////!
+ /////! @file TXLib.h
+ /////! @brief Библиотека Тупого Художника (The Dumb Artist Libr [остаток строки не уместился]";.
+ ///
+ internal static string TXLib {
+ get {
+ return ResourceManager.GetString("TXLib", resourceCulture);
+ }
+ }
}
}
diff --git a/WindowsFormsApplication1/WindowsFormsApplication1/Properties/Resources.resx b/WindowsFormsApplication1/WindowsFormsApplication1/Properties/Resources.resx
index ffecec8..a688e92 100644
--- a/WindowsFormsApplication1/WindowsFormsApplication1/Properties/Resources.resx
+++ b/WindowsFormsApplication1/WindowsFormsApplication1/Properties/Resources.resx
@@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
+
@@ -68,9 +69,10 @@
-
+
+
@@ -85,9 +87,10 @@
-
+
+
@@ -109,9 +112,13 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\TXLib.h;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;windows-1251
+
\ No newline at end of file
diff --git a/WindowsFormsApplication1/WindowsFormsApplication1/bin/Debug/TXLib.h b/WindowsFormsApplication1/WindowsFormsApplication1/TXLib.h
similarity index 97%
rename from WindowsFormsApplication1/WindowsFormsApplication1/bin/Debug/TXLib.h
rename to WindowsFormsApplication1/WindowsFormsApplication1/TXLib.h
index 7142542..b54383f 100644
--- a/WindowsFormsApplication1/WindowsFormsApplication1/bin/Debug/TXLib.h
+++ b/WindowsFormsApplication1/WindowsFormsApplication1/TXLib.h
@@ -1,8499 +1,8499 @@
-//=================================================================================================================
-// [These sections are for folding control in Code::Blocks]
-//{ [Best viewed with "Fold all on file open" option enabled] [best screen width is 115 chars]
-//=================================================================================================================
-//!
-//! @file TXLib.h
-//! @brief (The Dumb Artist Library, TX Library, TXLib).
-//!
-//! $Version: 00172a, Revision: 104 $
-//! $Copyright: (C) Ded (Ilya Dedinsky, http://txlib.ru) $
-//! $Date: 2014-08-09 16:37:26 +0400 $
-//!
-//! TX Library - Win32 ++.
-//! ""
-//! . .
-//!
-//! 1 TX Library -
-//! .
-//!
-//! TX Library is a tiny 2D graphics library for Win32 written in C++. This is a small
-//! sandbox for the very beginners to help them to learn basic programming principles.
-//! The documentation is currently in Russian.
-//!
-//! : txlib.ru.
-//!
-//! . SourceForge.
-//!
-//! @warning -. . @nn
-//! .
-//! .
-//!
-//! @par SourceForge:
-//! -
-//! -
-//!
-//! @par
-//! -#
-//! .., .., .., .., .., .., ..
-//! . Batman
-//! Proceedings in Sheep Philosophy, 2003, Vol. 22. pp. 23-24.
-//!
-// $Copyright: (C) Ded (Ilya Dedinsky, http://txlib.ru) $
-//-----------------------------------------------------------------------------------------------------------------
-//!
-//! @defgroup Drawing
-//! @defgroup Mouse
-//! @defgroup Dialogs
-//! @defgroup Misc
-//! @defgroup Service
-//! @defgroup Technical
-//}
-//=================================================================================================================
-
-#if !defined (__TXLIB_H_INCLUDED) // <<<<<<<<< The code is here, unfold it <<<<<<<<<<<<<<<<<<<<<<<<<
-#define __TXLIB_H_INCLUDED
-
-//-----------------------------------------------------------------------------------------------------------------
-//{ Version information
-//-----------------------------------------------------------------------------------------------------------------
-
-//! @cond INTERNAL
-#define _TX_V_FROM_CVS(_1,file,ver,rev,date,auth,_2) "TXLib [Ver: " #ver ", Rev: " #rev "]"
-#define _TX_A_FROM_CVS(_1,file,ver,rev,date,auth,_2) "Copyright (C) " auth
-#define _TX_v_FROM_CVS(_1,file,ver,rev,date,auth,_2) ((0x##ver << 16) | 0x##rev)
-//! @endcond
-
-//{----------------------------------------------------------------------------------------------------------------
-//! @ingroup Technical
-//! @brief .
-//!
-//! @code
-//! #define _TX_VERSION "TXLib [Version: 1.72a, Revision 50]" ()
-//! #define _TX_AUTHOR "Copyright (C) Ded (Ilya Dedinsky, http://txlib.ru)"
-//! @endcode
-//! .
-//!
-//! @see txVersion()
-//!
-//! @hideinitializer
-//}----------------------------------------------------------------------------------------------------------------
-//! @{
-
-#define _TX_VERSION _TX_V_FROM_CVS ($VersionInfo: , TXLib.h, 00172a, 104, 2014-08-09 16:37:26 +0400, "Ded (Ilya Dedinsky, http://txlib.ru) ", $)
-#define _TX_AUTHOR _TX_A_FROM_CVS ($VersionInfo: , TXLib.h, 00172a, 104, 2014-08-09 16:37:26 +0400, "Ded (Ilya Dedinsky, http://txlib.ru) ", $)
-
-//! @}
-//{----------------------------------------------------------------------------------------------------------------
-//! @ingroup Technical
-//! @brief .
-//!
-//! : - , - , - .
-//! , @c 0x172a0050 - @c 0.172a, @c 50.
-//!
-//! .
-//!
-//! @see txVersion()
-//! @usage @code
-//! #if !(defined (_TX_VER) && (_TX_VER >= 0x172a0000))
-//! #error Must use TXLib.h version >= 1.72 to compile this.
-//! #endif
-//! @endcode
-//!
-//! @hideinitializer
-//}----------------------------------------------------------------------------------------------------------------
-
-#define _TX_VER _TX_v_FROM_CVS ($VersionInfo: , TXLib.h, 00172a, 104, 2014-08-09 16:37:26 +0400, "Ded (Ilya Dedinsky, http://txlib.ru) ", $)
-
-//}
-//-----------------------------------------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------------------------------------
-//{ Compiler- and platform-specific
-//! @name
-//-----------------------------------------------------------------------------------------------------------------
-//! @{ @cond INTERNAL
-
-#if !defined (__cplusplus)
-
- #ifdef __GNUC__
- #error
- #error --------------------------------------------------------------------------------------------------------
- #endif
- #error TXLib.h: Must use C++ to compile TXLib.h.
- #error
- #error CHECK source file EXTENSION. Maybe it is ".C". It must be ".CPP".
- #error If your file is named, for example, "Untitled.C", go to menu [File], then
- #error then [Save As] and rename it to "Untitled.CPP". Please do NOT use spaces.
- #error --------------------------------------------------------------------------------------------------------
- #error
-
-#endif
-
-#if !defined (WIN32) && !defined (__WIN32__) && !defined(_WIN32) && !defined(_WIN32_WINNT)
-
- #ifdef __GNUC__
- #error
- #error --------------------------------------------------------------------------------------------------------
- #endif
- #error TXLib.h: Windows (MSVC/Win32 or GCC/MinGW) is the only supported system, sorry.
- #error
- #error In Linux or iOS, you should write your own TXLib and share it with your friends,
- #error or use wine.
- #error --------------------------------------------------------------------------------------------------------
- #error
-
-#endif
-
-#if defined (UNICODE) || defined (_UNICODE)
-
- #ifdef __GNUC__
- #warning TXLib.h: Disabling the UNICODE
- #endif
-
- #undef UNICODE // Burn Unicode, burn
- #undef _UNICODE
-
- #if defined (_WINDOWS_H) || defined (_INC_WINDOWS) || defined (_WINDOWS_) || defined (__WINDOWS__)
-
- #ifdef __GNUC__
- #error
- #error --------------------------------------------------------------------------------------------------------
- #endif
- #error TXLib.h: Should include "TXLib.h" BEFORE or INSTEAD of in UNICODE mode.
- #error
- #error REARRANGE your #include directives, or DISABLE the UNICODE mode.
- #error --------------------------------------------------------------------------------------------------------
- #error
-
- #endif
-
-#endif
-
-#if defined (__STRICT_ANSI__) // Try to extend strict ANSI rules
-
- #ifdef __GNUC__
- #warning TXLib.h: Trying to extend strict ANSI compatibility
- #endif
-
- #undef __STRICT_ANSI__
- #define __STRICT_ANSI__UNDEFINED
-
- #if defined (_STRING_H_) || defined (_INC_STRING) || defined (_STDIO_H_) || defined (_INC_STDIO)
-
- #ifdef __GNUC__
- #error
- #error --------------------------------------------------------------------------------------------------------
- #endif
- #error TXLib.h: Should include "TXLib.h" BEFORE or in Strict ANSI mode.
- #error
- #error REARRANGE your #include directives, or DISABLE ANSI-compliancy.
- #error --------------------------------------------------------------------------------------------------------
- #error
-
- #endif
-
-#endif
-
-#if defined (__GNUC__)
-
- #define _GCC_VER ( __GNUC__*100 + __GNUC_MINOR__*10 + __GNUC_PATCHLEVEL__ )
-
- #if defined (_GCC_VER) && (_GCC_VER >= 420)
-
- #if (_GCC_VER >= 460)
- #pragma GCC diagnostic push
- #endif
-
- #pragma GCC optimize ("no-strict-aliasing")
- #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-
- #pragma GCC diagnostic ignored "-Wshadow"
-
- #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
- #pragma GCC diagnostic ignored "-Wunreachable-code"
- #pragma GCC diagnostic ignored "-Wold-style-cast"
- #pragma GCC diagnostic ignored "-Wunused-label" // Just for fun in _txCanvas_OnCmdAbout()
- #pragma GCC diagnostic ignored "-Winline"
-
- #define _TX_THREAD __thread
-
- #else
- #define _TX_THREAD
-
- #endif
-
- #define _TX_CHECK_FORMAT( at ) __attribute__ (( format (printf, (at), (at)+1) ))
-
- template
- inline T _txNOP (T value) { return value; } // To suppress performance warnings in assert etc
-
- // From MinGW\include\float.h which is replaced by MinGW\lib\gcc\i686-pc-mingw32\x.x.x\include\float.h
- extern "C" unsigned int __cdecl _controlfp (unsigned int unNew, unsigned int unMask);
- extern "C" void __cdecl _fpreset (void);
-
-#else
-
- #define _TX_CHECK_FORMAT( at )
-
- #define _txNOP( value ) ( value )
-
-#endif
-
-#if defined (_MSC_VER)
-
- #pragma warning (push, 4) // Set maximum warning level
-
- #pragma warning (disable: 4127) // conditional expression is constant
- #pragma warning (disable: 4351) // new behavior: elements of array will be default initialized
- #pragma warning (disable: 4702) // unreachable code
-
- #define _TX_THREAD __declspec (thread)
-
-#endif
-
-#if defined (_MSC_VER) && (_MSC_VER == 1200) // MSVC 6 (1998)
-
- #define _MSC_VER_6 // Flag the bad dog
-
- #pragma warning (disable: 4511) // copy constructor could not be generated
- #pragma warning (disable: 4512) // assignment operator could not be generated
- #pragma warning (disable: 4514) // unreferenced inline function has been removed
- #pragma warning (disable: 4663) // C++ language change: to explicitly specialize class template
- #pragma warning (disable: 4710) // function not inlined
- #pragma warning (disable: 4786) // identifier was truncated to '255' characters in the debug information
-
- #if !defined (WINVER)
- #define WINVER 0x0400 // MSVC 6: Defaults to Windows 95
- #endif
-
- #if !defined (NDEBUG)
- #define _CRTDBG_MAP_ALLOC 1 // Set debug mode heap allocation
- #endif
-
-#endif
-
-#if defined (_MSC_VER) && (_MSC_VER >= 1400) // MSVC 8 (2005) or greater
-
- #pragma warning (disable: 26135) // missing locking annotation
- #pragma warning (disable: 28125) // the function must be called from within a try/except block
- #pragma warning (disable: 28159) // consider using another function instead
-
- #pragma setlocale ("russian") // Set source file encoding, see also _TX_CP
-
- #if !defined (NDEBUG)
- #pragma check_stack (on) // Turn on stack probes at runtime
- #pragma strict_gs_check (push, on) // Detects stack buffer overruns
- #endif
-
- #define _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES 1
- #define _TX_TRUNCATE , _TRUNCATE
-
-#else
-
- #define strcpy_s strcpy // MSVC prior to 8 (2005) versions and GCC
- #define strncpy_s strncpy // do NOT have secure variants of these
- #define strncat_s strncat // functions, so use insecure ones.
- #define wcsncpy_s wcsncpy // ...
- #define _snprintf_s _snprintf //
- #define _vsnprintf_s _vsnprintf //
-
- #define strerror_s( buf, code ) ( strncpy ((buf), strerror (code), sizeof(buf)-1) )
- #define ctime_s( buf, sizeof_buf, time ) ( strncpy ((buf), ctime (time), (sizeof_buf)-1) )
- #define getenv_s( sz, buf, sizeof_buf, name ) ( (void)(sz), strncpy ((buf), getenv (name), (sizeof_buf)-1) )
- #define strtok_s( buf, delim, ctx ) ( (void)(ctx), strtok ((buf), (delim)) )
-
- #if !( defined (_GCC_VER) && (_GCC_VER == 471) && defined (__x86_64__) ) // GCC 4.7.1 x64 already has it
- #define _controlfp_s( oldCtl, newCtl, mask ) ( *(oldCtl) = _controlfp (newCtl, mask), 0 )
- #endif
-
- #define _TX_TRUNCATE
-
-#endif
-
-#if defined (__INTEL_COMPILER)
-
- #pragma warning (disable: 174) // remark: expression has no effect
- #pragma warning (disable: 304) // remark: access control not specified ("public" by default)
- #pragma warning (disable: 522) // remark: function "..." redeclared "inline" after being called
- #pragma warning (disable: 981) // remark: operands are evaluated in unspecified order
- #pragma warning (disable: 1684) // conversion from pointer to same-sized integral type (potential portability problem)
-
-#endif
-
-#if !defined (WINVER)
- #define WINVER 0x0500 // Defaults to Windows 2000
- #define WINDOWS_ENABLE_CPLUSPLUS // Allow use of type-limit macros in ,
-#endif // they allowed by default if WINVER >= 0x0600.
-
-#if !defined (_WIN32_WINNT)
- #define _WIN32_WINNT WINVER // Defaults to the same as WINVER
-#endif
-
-#if !defined (_WIN32_IE)
- #define _WIN32_IE WINVER // Defaults to the same as WINVER
-#endif
-
-#define _USE_MATH_DEFINES // math.h's M_PI etc.
-
-//! @} @endcond
-//}
-//-----------------------------------------------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------------------------------------------
-//{ The Includes
-//-----------------------------------------------------------------------------------------------------------------
-
-#ifdef _MSC_VER_6
- #pragma warning (push, 3) // MSVC 6: At level 4, some std headers emit warnings O_o
-#endif
-
-//-----------------------------------------------------------------------------------------------------------------
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include