Set eol-style to native to keep things sane.

[apple2] / src / gui / textedit.cpp

diff --git a/src/gui/textedit.cpp b/src/gui/textedit.cpp
index 96e45e71d5a4d32534f5ce5b3f8ffd203b89e2be..96be146397091dc5a2a7f3e85eedf4aacd983313 100755 (executable)
--- a/src/gui/textedit.cpp
+++ b/src/gui/textedit.cpp
@@ -27,12 +27,14 @@
 #define MASK_A 0xFF000000
 #endif
 
+using namespace std;                                                           // For STL stuff
+
 //
 // Text edit class implementation
 //
 
 TextEdit::TextEdit(uint32 x/*= 0*/, uint32 y/*= 0*/, uint32 w/*= 0*/, uint32 h/*= 0*/,
-       std::string s/*= ""*/, Element * parent/*= NULL*/):
+       string s/*= ""*/, Element * parent/*= NULL*/):
        Element(x, y, w, h, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x40, 0x40, 0xFF, parent),
        activated(false), clicked(false), inside(false),
        img(NULL), text(s), caretPos(0), scrollPos(0),
@@ -225,7 +227,7 @@ void TextEdit::Notify(Element *)
 {
 }
 
-std::string TextEdit::GetText(void)
+string TextEdit::GetText(void)
 {
        return text;
 }