GNOME.org
 

[dasher: 11/61] Cleanup. No more WinCE code.

commit bf3bb1aaa62ef7550a32fb76a2d8a85fbc7d0680
Author: Ada Majorek <amajorek google com>
Date:   Tue Mar 8 11:35:52 2016 -0800

    Cleanup. No more WinCE code.

 Src/Common/Trace.cpp                   |    2 -
 Src/Common/myassert.h                  |   10 --------
 Src/DasherCore/ControlManager.h        |    5 ----
 Src/DasherCore/NodeCreationManager.cpp |    3 --
 Src/Win32/Dasher.cpp                   |    4 ---
 Src/Win32/Dasher.h                     |    5 ----
 Src/Win32/Widgets/Canvas.cpp           |   36 --------------------------------
 Src/Win32/Widgets/FilenameGUI.cpp      |    4 ---
 Src/Win32/Widgets/Screen.h             |    4 ---
 9 files changed, 0 insertions(+), 73 deletions(-)
---
diff --git a/Src/Common/Trace.cpp b/Src/Common/Trace.cpp
index b3a0d68..3024693 100644
--- a/Src/Common/Trace.cpp
+++ b/Src/Common/Trace.cpp
@@ -26,12 +26,10 @@ static char THIS_FILE[] = __FILE__;
 #include "Windows.h"
 
 void DasherTraceOutputImpl(const char *pszFormat, va_list vargs) {
-#ifndef _WIN32_WCE
        // TODO: Reimplement
 //  char buffer[2048];
 //  _vsnprintf(buffer, 2048,pszFormat, vargs);
 //  OutputDebugStringA(buffer);
-#endif
 }
 
 #else
diff --git a/Src/Common/myassert.h b/Src/Common/myassert.h
index e710405..0217acd 100644
--- a/Src/Common/myassert.h
+++ b/Src/Common/myassert.h
@@ -30,20 +30,10 @@
 
 #ifdef DEBUG
 #ifdef _WIN32
-#ifdef _WIN32_WCE
 
-// Windows CE
-void __cdecl __debugbreak(void);
-#define DASHER_ASSERT(x)   if (!(x)) __debugbreak()
-
-#else
-
-// Other Win32 platforms
 #include <crtdbg.h>
 #define DASHER_ASSERT(expr) _ASSERT(expr)
 
-#endif // _WIN32_WCE
-
 #else 
 
 // POSIX platforms (eg Linux)
diff --git a/Src/DasherCore/ControlManager.h b/Src/DasherCore/ControlManager.h
index ac495f5..6425396 100644
--- a/Src/DasherCore/ControlManager.h
+++ b/Src/DasherCore/ControlManager.h
@@ -31,11 +31,6 @@
 #include <map>
 #include <fstream>
 #include <iostream>
-
-#ifndef _WIN32_WCE
-#include <sys/stat.h>
-#endif
-
 #include <string>
 
 #include <expat.h>
diff --git a/Src/DasherCore/NodeCreationManager.cpp b/Src/DasherCore/NodeCreationManager.cpp
index 9a86739..f2145c5 100644
--- a/Src/DasherCore/NodeCreationManager.cpp
+++ b/Src/DasherCore/NodeCreationManager.cpp
@@ -149,9 +149,6 @@ void CNodeCreationManager::AddExtras(CDasherNode *pParent) {
   //control mode:
   DASHER_ASSERT(pParent->GetChildren().back()->Hbnd() == m_iAlphNorm);
   if (m_pControlManager) {
-#ifdef _WIN32_WCE
-    DASHER_ASSERT(false);
-#endif
     //ACL leave offset as is - like its groupnode parent, but unlike its alphnode siblings,
     //the control node does not enter a symbol....
     CDasherNode *ctl = m_pControlManager->GetRoot(pParent, pParent->offset());
diff --git a/Src/Win32/Dasher.cpp b/Src/Win32/Dasher.cpp
index 73a5ccc..f515d38 100644
--- a/Src/Win32/Dasher.cpp
+++ b/Src/Win32/Dasher.cpp
@@ -30,10 +30,8 @@ CDasher::CDasher(HWND Parent, CDasherWindow *pWindow, CEdit *pEdit, Dasher::CSet
   : CDashIntfScreenMsgs(settings, fileUtils), m_hParent(Parent), m_pWindow(pWindow), m_pEdit(pEdit) {
   // This class will be a wrapper for the Dasher 'control' - think ActiveX
 
-#ifndef _WIN32_WCE
   // Set up COM for the accessibility stuff
   CoInitialize(NULL);
-#endif
 #ifdef WIN32_SPEECH
   m_bAttemptedSpeech = false;
 #endif
@@ -59,10 +57,8 @@ CDasher::~CDasher(void) {
 void CDasher::CreateModules() {
   //create default set first.
   CDasherInterfaceBase::CreateModules();
-#ifndef _WIN32_WCE
   RegisterModule(new CSocketInput(this,this));
   RegisterModule(new CBTSocketInput());
-#endif
   RegisterModule(new CDasherMouseInput(m_pCanvas->getwindow()));
 }
 
diff --git a/Src/Win32/Dasher.h b/Src/Win32/Dasher.h
index a194a89..fce443a 100644
--- a/Src/Win32/Dasher.h
+++ b/Src/Win32/Dasher.h
@@ -4,11 +4,6 @@
 #include "../DasherCore/DashIntfScreenMsgs.h"
 #include "../DasherCore/UserLog.h"
 
-#ifdef _WIN32_WCE
-//on WinCE, do not support speech
-#undef WIN32_SPEECH
-#endif
-
 #ifdef WIN32_SPEECH
 #include <sapi.h>
 #endif
diff --git a/Src/Win32/Widgets/Canvas.cpp b/Src/Win32/Widgets/Canvas.cpp
index 99ba9b2..bb62ee9 100644
--- a/Src/Win32/Widgets/Canvas.cpp
+++ b/Src/Win32/Widgets/Canvas.cpp
@@ -24,10 +24,8 @@
 
 #include "..\Common\WinCommon.h"
 
-#ifndef _WIN32_WCE
 #include <Vsstyle.h>
 #include "../TabletPC/SystemInfo.h"
-#endif
 
 #include "Canvas.h"
 #include "../Dasher.h"
@@ -44,14 +42,6 @@ CCanvas::CCanvas(CDasher *DI) : m_pDasherInterface(DI) {
 #ifndef HAVE_NO_THEME
   m_hTheme = NULL;
 #endif
-
-#ifndef _WIN32_WCE
-
-#else
-  WNDCLASS canvasclass;
-  GetClassInfo(NULL, TEXT("STATIC"), &canvasclass);
-  canvasclass.lpszClassName = TEXT("CANVAS");
-#endif
 }
 
 HWND CCanvas::Create(HWND hParent, const std::string &strFont) {
@@ -79,7 +69,6 @@ LRESULT CCanvas::OnCreate(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHan
   m_hTheme = OpenThemeData(m_hWnd, L"Edit");
 #endif
 
-#ifndef _WIN32_WCE
   // If we're a tablet, initialize the event-generator
   if(IsTabletPC()) {
     HRESULT h = m_CursorInRange.Initialize(m_hWnd);
@@ -88,8 +77,6 @@ LRESULT CCanvas::OnCreate(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHan
       return -1;
     }
   }
-#endif
-
   return 0;
 }
 
@@ -299,41 +286,19 @@ LRESULT CCanvas::OnLButtonDblClk(UINT message, WPARAM wParam, LPARAM lParam, BOO
 LRESULT CCanvas::OnLButtonDown(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
   bHandled = TRUE;
- 
-#ifndef _WIN32_WCE
-  // FIXME - what does this do - please document
-  LPARAM lp = GetMessageExtraInfo();
-  if (lp == 0xFF515702)
-    return 0; 
-  // ---
-#endif
-  
   m_pDasherInterface->KeyDown(GetTickCount(), 100);
-  
-  // TODO: Reimplement
-  //   else if ( m_pDasherInterface->GetBoolParameter(BP_START_STYLUS)  ) 
-  //   {
-  //           // DJW - for the time being we only do stylus mode if not BP_START_MOUSE 
-  //
-  //           if ( m_pDasherInterface->GetBoolParameter(BP_DASHER_PAUSED) )
-  //                   m_pDasherInterface->Unpause(GetTickCount());
-  //   }
-  
   SetFocus();
-
   return 0;
 }
 
 LRESULT CCanvas::OnLButtonUp(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 {
        bHandled = TRUE;
-
        m_pDasherInterface->KeyUp(GetTickCount(), 100);
        return 0;
 
 }
 
-#ifndef _WIN32_WCE
 // PRLW: These two functions are called on Tablet PCs when the stylus comes
 // within or leaves the detection range of screen. Make these appear as mouse
 // clicks to start/stop on mouse click. (XXX Ideally we would prefer start/stop
@@ -360,7 +325,6 @@ LRESULT CCanvas::OnCursorOutOfRange(UINT message, WPARAM wParam, LPARAM lParam,
 
        return 0;
 }
-#endif
 
 LRESULT CCanvas::OnSize(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
        if (LOWORD(lParam)>0 && HIWORD(lParam) >0) {
diff --git a/Src/Win32/Widgets/FilenameGUI.cpp b/Src/Win32/Widgets/FilenameGUI.cpp
index 62736c9..a585348 100644
--- a/Src/Win32/Widgets/FilenameGUI.cpp
+++ b/Src/Win32/Widgets/FilenameGUI.cpp
@@ -54,7 +54,6 @@ const Tstring CFilenameGUI::Empty = TEXT("");
 CFilenameGUI::CFilenameGUI(HWND WindowWithTitlebar, Tstring AppName, bool NewWithDate)
 :WindowWithTitlebar(WindowWithTitlebar), AppName(AppName), NewWithDate(NewWithDate), Dirty(false), 
FileAndPath(TEXT("")) {
 
-#ifndef _WIN32_WCE
   TCHAR CurrentDirectory[_MAX_DIR];
   if(GetCurrentDirectory(_MAX_DIR, CurrentDirectory) > 0) {
     OriginalPath = CurrentDirectory;
@@ -63,7 +62,6 @@ CFilenameGUI::CFilenameGUI(HWND WindowWithTitlebar, Tstring AppName, bool NewWit
       OriginalPath += TEXT('\\');       // the directory separator
   }
   else
-#endif
     OriginalPath = TEXT("");
 
   if(NewWithDate) {
@@ -181,12 +179,10 @@ void CFilenameGUI::SetDirty(bool Value) {
 void CFilenameGUI::SetWindowTitle() {
   Tstring TitleText;
 
-#ifndef _WIN32_WCE
   TCHAR PrettyName[_MAX_FNAME];
   if(GetFileTitle(FileAndPath.c_str(), PrettyName, _MAX_FNAME) == 0)
     TitleText = PrettyName;
   else
-#endif
     WinLocalisation::GetResourceString(IDS_UNTITLED_FILE, &TitleText);
 
   if(Dirty)
diff --git a/Src/Win32/Widgets/Screen.h b/Src/Win32/Widgets/Screen.h
index 43651c8..6c9fe6f 100644
--- a/Src/Win32/Widgets/Screen.h
+++ b/Src/Win32/Widgets/Screen.h
@@ -19,10 +19,6 @@
 #include <map>
 #include <unordered_map>
 
-#ifndef _WIN32_WCE
-#include <cmath>
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 
 class CScreen:public Dasher::CLabelListScreen, private NoClones {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]