Set eol-style to native to keep things sane.

[apple2] / src / apple2.cpp

diff --git a/src/apple2.cpp b/src/apple2.cpp
index dbdb619287e5d4de84e1b13fc405616c8bbeadb1..7621a2e679edfefe1fb8393a5f59ebacf3b23678 100755 (executable)
--- a/src/apple2.cpp
+++ b/src/apple2.cpp
@@ -51,7 +51,7 @@
 
 #include "gui/gui.h"
 #include "gui/window.h"
-#include "gui/draggablewindow2.h"
+#include "gui/draggablewindow.h"
 #include "gui/textedit.h"
 
 using namespace std;
@@ -98,7 +98,7 @@ static void BlinkTimer(void);
 
 Element * TestWindow(void)
 {
-       Element * win = new DraggableWindow2(10, 10, 128, 128);
+       Element * win = new DraggableWindow(10, 10, 128, 128);
 //     ((DraggableWindow *)win)->AddElement(new TextEdit(4, 16, 92, 0, "u2prog.dsk", win));
 
        return win;
@@ -316,28 +316,28 @@ if (addr >= 0xC080 && addr <= 0xC08F)
 A-9 (Mockingboard)
 APPENDIX F Assembly Language Program Listings
 
-                       1       *PRIMARY ROUTINES
-                       2       *FOR SLOT 4
-                       3       *
-                       4                       ORG     $9000
-                       5       *                               ;ADDRESSES
-                                                                               FOR FIRST
-                                                                               6522
-                       6       ORB             EQU     $C400           ;PORT B
-                       7       ORA             EQU     $C401           ;PORT A
-                       8       DDRB            EQU     $C402           ;DATA DIRECTION
-                                                                               REGISTER (A)
-                       9       DDRA            EQU     $C403           ;DATA DIRECTION
-                                                                               REGISTER (B)
-                       10      *                                       ;ADDRESSES
-                                                                               FOR SECOND
-                                                                               6522
-                       11      ORB2            EQU     $C480           ;PORT B
-                       12      ORA2            EQU     $C481           ;PORT A
-                       13      DDRB2   EQU     $C482           ;DATA DIRECTION
-                                                                               REGISTER (B)
-                       14      DDRA2   EQU     $C483           ;DATA DIRECTION
-                                                                               REGISTER (A)
+1      *PRIMARY ROUTINES
+2      *FOR SLOT 4
+3      *
+4                      ORG     $9000
+5      *                               ;ADDRESSES
+                                       FOR FIRST
+                                       6522
+6      ORB             EQU     $C400           ;PORT B
+7      ORA             EQU     $C401           ;PORT A
+8      DDRB            EQU     $C402           ;DATA DIRECTION
+                                                       REGISTER (A)
+9      DDRA            EQU     $C403           ;DATA DIRECTION
+                                                       REGISTER (B)
+10     *                                       ;ADDRESSES
+                                                       FOR SECOND
+                                                       6522
+11     ORB2            EQU     $C480           ;PORT B
+12     ORA2            EQU     $C481           ;PORT A
+13     DDRB2   EQU     $C482           ;DATA DIRECTION
+                                                       REGISTER (B)
+14     DDRA2   EQU     $C483           ;DATA DIRECTION
+                                                       REGISTER (A)
 */
 void WrMem(uint16 addr, uint8 b)
 {