Set the eol style on the project to native, to avoid line ending chaos.

[ttedit] / src / charwindow.cpp

diff --git a/src/charwindow.cpp b/src/charwindow.cpp
index 00adcd8c05e7ac334180fe586b890fc7511db857..4c601c8392e27ae21dc27fca89ba784fa5d884ce 100755 (executable)
--- a/src/charwindow.cpp
+++ b/src/charwindow.cpp
@@ -1,56 +1,56 @@
-//\r
-// TTEDIT.CPP - The TrueType Editor\r
-// by James L. Hammons\r
-// (C) 2004 Underground Software\r
-//\r
-// JLH = James L. Hammons <jlhamm@acm.org>\r
-//\r
-// Who  When        What\r
-// ---  ----------  -------------------------------------------------------------\r
-// JLH  08/28/2008  Created this file\r
-//\r
-\r
-// FIXED:\r
-//\r
-// STILL TO BE DONE:\r
-//\r
-// - Fix problem with owned window causing main window refresh problems\r
-//   (ironically enough, it doesn't seem to be a problem anymore...)\r
-//\r
-\r
-#include "charwindow.h"\r
-\r
-\r
-BEGIN_EVENT_TABLE(CharWindow, wxMiniFrame)\r
-       EVT_PAINT(CharWindow::OnPaint)\r
-//     EVT_MOUSE_EVENTS(CharWindow::OnMouseEvent)\r
-END_EVENT_TABLE()\r
-\r
-CharWindow::CharWindow(wxFrame * parent, const wxString &title, const wxPoint &pos,\r
-       const wxSize &size, long style): wxMiniFrame(parent, -1, title, pos, size, style)\r
-{\r
-       Show(false);\r
-}\r
-\r
-CharWindow::~CharWindow()\r
-{\r
-}\r
-\r
-void CharWindow::OnPaint(wxPaintEvent &e)\r
-{\r
-       wxPaintDC dc(this);\r
-//doesnothing  dc.SetBackground(*wxWHITE_BRUSH);\r
-\r
-//     wxMemoryDC memDC;\r
-//     memDC.SelectObject(*bmp);\r
-//     dc.Blit(0, 0, sizeTPBM.x, sizeTPBM.y, &memDC, 0, 0, wxCOPY);\r
-\r
-//     if (prevTool != -1)\r
-//     {\r
-//         //need ul corner of bitmap, ul corner of dest, width/height\r
-//             wxPoint pt(sizeStamp.x * (prevTool & 0x03), sizeStamp.y * (prevTool >> 2));\r
-//             dc.Blit(pt.x, pt.y, sizeStamp.x, sizeStamp.y, &memDC, pt.x, pt.y, wxSRC_INVERT);\r
-//     }\r
-\r
-//     memDC.SelectObject(wxNullBitmap);\r
-}\r
+//
+// TTEDIT.CPP - The TrueType Editor
+// by James L. Hammons
+// (C) 2004 Underground Software
+//
+// JLH = James L. Hammons <jlhamm@acm.org>
+//
+// Who  When        What
+// ---  ----------  -------------------------------------------------------------
+// JLH  08/28/2008  Created this file
+//
+
+// FIXED:
+//
+// STILL TO BE DONE:
+//
+// - Fix problem with owned window causing main window refresh problems
+//   (ironically enough, it doesn't seem to be a problem anymore...)
+//
+
+#include "charwindow.h"
+
+
+BEGIN_EVENT_TABLE(CharWindow, wxMiniFrame)
+       EVT_PAINT(CharWindow::OnPaint)
+//     EVT_MOUSE_EVENTS(CharWindow::OnMouseEvent)
+END_EVENT_TABLE()
+
+CharWindow::CharWindow(wxFrame * parent, const wxString &title, const wxPoint &pos,
+       const wxSize &size, long style): wxMiniFrame(parent, -1, title, pos, size, style)
+{
+       Show(false);
+}
+
+CharWindow::~CharWindow()
+{
+}
+
+void CharWindow::OnPaint(wxPaintEvent &e)
+{
+       wxPaintDC dc(this);
+//doesnothing  dc.SetBackground(*wxWHITE_BRUSH);
+
+//     wxMemoryDC memDC;
+//     memDC.SelectObject(*bmp);
+//     dc.Blit(0, 0, sizeTPBM.x, sizeTPBM.y, &memDC, 0, 0, wxCOPY);
+
+//     if (prevTool != -1)
+//     {
+//         //need ul corner of bitmap, ul corner of dest, width/height
+//             wxPoint pt(sizeStamp.x * (prevTool & 0x03), sizeStamp.y * (prevTool >> 2));
+//             dc.Blit(pt.x, pt.y, sizeStamp.x, sizeStamp.y, &memDC, pt.x, pt.y, wxSRC_INVERT);
+//     }
+
+//     memDC.SelectObject(wxNullBitmap);
+}