[dasher: 7/43] GC CDasherView::DrawText and CDelayedDraw



commit 3f184fbfd880b30f86c1cc4d54c899147b361984
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Mon May 30 15:14:53 2011 +0100

    GC CDasherView::DrawText and CDelayedDraw
    
    DelayedDraw.{h,cpp} removed from iPhone project file and Makefile.am;
      seems already removed from MacOSX & Win32 (?)

 Src/DasherCore/DasherView.cpp               |    7 ---
 Src/DasherCore/DasherView.h                 |    2 -
 Src/DasherCore/DasherViewSquare.h           |    3 -
 Src/DasherCore/DelayedDraw.cpp              |   25 -----------
 Src/DasherCore/DelayedDraw.h                |   63 ---------------------------
 Src/DasherCore/Makefile.am                  |    2 -
 Src/iPhone/Dasher.xcodeproj/project.pbxproj |    6 ---
 7 files changed, 0 insertions(+), 108 deletions(-)
---
diff --git a/Src/DasherCore/DasherView.cpp b/Src/DasherCore/DasherView.cpp
index 377fbed..3e8dc0f 100644
--- a/Src/DasherCore/DasherView.cpp
+++ b/Src/DasherCore/DasherView.cpp
@@ -176,13 +176,6 @@ void CDasherView::DasherDrawCentredRectangle(myint iDasherX, myint iDasherY, scr
   Screen()->DrawRectangle(iScreenX - iSize, iScreenY - iSize, iScreenX + iSize, iScreenY + iSize, Color, -1, bDrawOutline ? 1 : 0);
 }
 
-void CDasherView::DrawText(const std::string & str, myint x, myint y, int Size, int iColor) {
-  screenint X, Y;
-  Dasher2Screen(x, y, X, Y);
-  
-  Screen()->DrawString(str, X, Y, Size, iColor);
-}
-
 
 void CDasherView::SetDemoMode(bool bDemoMode)
 {
diff --git a/Src/DasherCore/DasherView.h b/Src/DasherCore/DasherView.h
index b7b8e6e..f2c01e4 100644
--- a/Src/DasherCore/DasherView.h
+++ b/Src/DasherCore/DasherView.h
@@ -141,8 +141,6 @@ public:
 
   void DasherDrawCentredRectangle(myint iDasherX, myint iDasherY, screenint iSize, const int Color, bool bDrawOutline);
 
-  void DrawText(const std::string & str, myint x, myint y, int Size, int iColor);
-
   /// @}
 
 protected:
diff --git a/Src/DasherCore/DasherViewSquare.h b/Src/DasherCore/DasherViewSquare.h
index f514a02..30216a8 100644
--- a/Src/DasherCore/DasherViewSquare.h
+++ b/Src/DasherCore/DasherViewSquare.h
@@ -5,7 +5,6 @@
 #ifndef __DasherViewSquare_h__
 #define __DasherViewSquare_h__
 #include "DasherView.h"
-#include "DelayedDraw.h"
 #include "DasherScreen.h"
 #include <deque>
 #include "Alphabet/GroupInfo.h"
@@ -18,13 +17,11 @@ namespace Dasher {
   class CDasherViewSquare;
   class CDasherView;
   class CDasherModel;
-  class CDelayedDraw;
   class CDasherNode;
 }
 
 class Dasher::CDasherViewSquare;
 class Dasher::CDasherModel;
-class Dasher::CDelayedDraw;
 class Dasher::CDasherNode;
 
 /// \ingroup View
diff --git a/Src/DasherCore/Makefile.am b/Src/DasherCore/Makefile.am
index c65f802..5ce69b0 100644
--- a/Src/DasherCore/Makefile.am
+++ b/Src/DasherCore/Makefile.am
@@ -71,8 +71,6 @@ libdashercore_a_SOURCES = \
 		DasherViewSquare.inl \
 		DefaultFilter.cpp \
 		DefaultFilter.h \
-		DelayedDraw.cpp \
-		DelayedDraw.h \
 		DynamicFilter.h \
 		DynamicFilter.cpp \
 		Event.h \
diff --git a/Src/iPhone/Dasher.xcodeproj/project.pbxproj b/Src/iPhone/Dasher.xcodeproj/project.pbxproj
index 23cb35e..fa7d40e 100755
--- a/Src/iPhone/Dasher.xcodeproj/project.pbxproj
+++ b/Src/iPhone/Dasher.xcodeproj/project.pbxproj
@@ -186,7 +186,6 @@
 		3344FE370F71717C00506EAA /* DasherViewSquare.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3344FDA90F71717C00506EAA /* DasherViewSquare.cpp */; };
 		3344FE380F71717C00506EAA /* DasherViewSquare.inl in Resources */ = {isa = PBXBuildFile; fileRef = 3344FDAB0F71717C00506EAA /* DasherViewSquare.inl */; };
 		3344FE390F71717C00506EAA /* DefaultFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3344FDAC0F71717C00506EAA /* DefaultFilter.cpp */; };
-		3344FE3A0F71717C00506EAA /* DelayedDraw.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3344FDAE0F71717C00506EAA /* DelayedDraw.cpp */; };
 		3344FE3B0F71717C00506EAA /* DynamicFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3344FDAF0F71717C00506EAA /* DynamicFilter.cpp */; };
 		3344FE3C0F71717C00506EAA /* EventHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3344FDB20F71717C00506EAA /* EventHandler.cpp */; };
 		3344FE3E0F71717C00506EAA /* FileLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3344FDB60F71717C00506EAA /* FileLogger.cpp */; };
@@ -303,7 +302,6 @@
 		3302678011B8026900C07880 /* scissors.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = scissors.png; sourceTree = "<group>"; };
 		3302678A11B8040D00C07880 /* spanner_lg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spanner_lg.png; sourceTree = "<group>"; };
 		3302678B11B8040D00C07880 /* spanner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spanner.png; sourceTree = "<group>"; };
-		3318BEF510F6346F00D4F877 /* DelayedDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DelayedDraw.h; sourceTree = "<group>"; };
 		331C73C10F71750D004492FF /* COSXSettingsStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = COSXSettingsStore.h; sourceTree = "<group>"; };
 		331C73C20F71750D004492FF /* COSXSettingsStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = COSXSettingsStore.mm; sourceTree = "<group>"; };
 		331C73F30F717594004492FF /* DasherUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DasherUtil.h; sourceTree = "<group>"; };
@@ -584,7 +582,6 @@
 		3344FDAB0F71717C00506EAA /* DasherViewSquare.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DasherViewSquare.inl; sourceTree = "<group>"; };
 		3344FDAC0F71717C00506EAA /* DefaultFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DefaultFilter.cpp; sourceTree = "<group>"; };
 		3344FDAD0F71717C00506EAA /* DefaultFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DefaultFilter.h; sourceTree = "<group>"; };
-		3344FDAE0F71717C00506EAA /* DelayedDraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DelayedDraw.cpp; sourceTree = "<group>"; };
 		3344FDAF0F71717C00506EAA /* DynamicFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicFilter.cpp; sourceTree = "<group>"; };
 		3344FDB00F71717C00506EAA /* DynamicFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicFilter.h; sourceTree = "<group>"; };
 		3344FDB10F71717C00506EAA /* Event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Event.h; sourceTree = "<group>"; };
@@ -1219,8 +1216,6 @@
 				3344FDAB0F71717C00506EAA /* DasherViewSquare.inl */,
 				3344FDAC0F71717C00506EAA /* DefaultFilter.cpp */,
 				3344FDAD0F71717C00506EAA /* DefaultFilter.h */,
-				3344FDAE0F71717C00506EAA /* DelayedDraw.cpp */,
-				3318BEF510F6346F00D4F877 /* DelayedDraw.h */,
 				3344FDAF0F71717C00506EAA /* DynamicFilter.cpp */,
 				3344FDB00F71717C00506EAA /* DynamicFilter.h */,
 				3344FDB10F71717C00506EAA /* Event.h */,
@@ -1582,7 +1577,6 @@
 				3344FE350F71717C00506EAA /* DasherView.cpp in Sources */,
 				3344FE370F71717C00506EAA /* DasherViewSquare.cpp in Sources */,
 				3344FE390F71717C00506EAA /* DefaultFilter.cpp in Sources */,
-				3344FE3A0F71717C00506EAA /* DelayedDraw.cpp in Sources */,
 				3344FE3B0F71717C00506EAA /* DynamicFilter.cpp in Sources */,
 				3344FE3C0F71717C00506EAA /* EventHandler.cpp in Sources */,
 				3344FE3E0F71717C00506EAA /* FileLogger.cpp in Sources */,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]