diff options
| author | lempamo <[email protected]> | 2017-07-13 12:09:22 -0500 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-07-13 12:09:22 -0500 |
| commit | 80b07723bc8c5a320436a577f2d88ca71f6dc299 (patch) | |
| tree | 1662f0f38e88c1ba53a64f594243f7e4e6a93028 /TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs | |
| parent | a48b40e45536ee5c58d4d6a23bde0a9fc2b8ae3d (diff) | |
| parent | 22cca68c0de30099891c4cf275968e10b0494d9f (diff) | |
| download | histacom2-80b07723bc8c5a320436a577f2d88ca71f6dc299.tar.gz histacom2-80b07723bc8c5a320436a577f2d88ca71f6dc299.tar.bz2 histacom2-80b07723bc8c5a320436a577f2d88ca71f6dc299.zip | |
fix conflict in vs :D
Diffstat (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs')
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs index bf0cb16..2453abc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -155,7 +155,7 @@ namespace TimeHACK.OS.Win95.Win95Apps void SetSelectedTextFont(string font) { - // The next two lines convert a String to a Font + // The next two lines convert a string to a Font var cvt = new FontConverter(); Font f = cvt.ConvertFromString(font) as Font; @@ -164,7 +164,7 @@ namespace TimeHACK.OS.Win95.Win95Apps void SetSelectedTextSize(string size) { - // The next few lines will ATTEMPT to convert a String to an Integer + // The next few lines will ATTEMPT to convert a string to an Integer int SizeInt = Convert.ToInt32(size); mainText.SelectionFont = new Font(mainText.SelectionFont.FontFamily, SizeInt, mainText.SelectionFont.Style); |