LogView.h in rhodes-5.5.0

- old
+ new

@@ -27,116 +27,34 @@
 #pragma once
 
 #include "logging/RhoLogConf.h"
 #include "resource.h"
 
-#if defined(OS_WINDOWS_DESKTOP)
 
-static UINT WM_FIND_TEXT = ::RegisterWindowMessage(FINDMSGSTRING);
-
-#define WS_EX_LAYOUT_RTL	0x00400000
-
-class CResizableGrip  
-{
-
-	// Members
-protected:
-	HWND m_hParent;
-	SIZE m_sizeGrip; // holds grip size
-	HWND m_wndGrip;	// grip control
-	CAtlArray<void*> m_wndControls; // controls allowed to dynamically move and resize
-	
-	RECT m_initialrect;
-	BOOL m_binitialrect;
-
-	// Constructor
-public:
-	CResizableGrip();
-	virtual ~CResizableGrip();
-
-
-	// Methods
-public:
-	BOOL InitGrip(HWND hParent);
-	void UpdateGripPos();
-	void ShowSizeGrip(BOOL bShow = TRUE);	// show or hide the size grip
-
-	HWND GetSafeHwnd();
-
-	void SetInitialRect(RECT *rect) { m_initialrect = *rect; m_binitialrect = TRUE;}
-	BOOL IsRectInitialized() { return m_binitialrect; }
-	RECT GetFinalRect() { return m_initialrect; }
-
-
-
-	// Helpers
-protected:
-	static BOOL IsRTL(HWND hwnd) {
-		DWORD dwExStyle = ::GetWindowLong(hwnd, GWL_EXSTYLE);
-		return (dwExStyle & WS_EX_LAYOUT_RTL);
-	}
-
-	static LRESULT CALLBACK GripWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-
-};
-#endif //OS_WINDOWS_DESKTOP
-
 // CLogView
 
 class CLogView : 
 	public CDialogImpl<CLogView>
-#if defined(OS_WINDOWS_DESKTOP)
-   ,public rho::ILogSink
-#endif
 {
     HBRUSH m_hBrush;
 	HWND m_hWndCommandBar;
 
     void loadLogText();
 public:
     CLogView() : 
 	  m_hBrush ( NULL ), m_hWndCommandBar(0)
-#if defined(OS_WINDOWS_DESKTOP)
-	, m_pFindDialog(NULL), m_findText(L""), m_findParams(FR_DOWN)
-#endif
 	{}
 	~CLogView(){}
 
-#if defined(OS_WINDOWS_DESKTOP)
-// IlogSink
-	static rho::common::CMutex m_ViewFlushLock;
-	CAtlList<rho::String> m_buffer;
-	void writeLogMessage( rho::String& strMsg );
-    int getCurPos(){ return -1; }
-    void clear(){}
-	void OnPopupMenuCommand();
-#endif
-
 // Dialog
-#if defined(OS_WINDOWS_DESKTOP)
-	enum { IDD = IDD_SIMULATOR_LOGVIEW };
-#else
 	enum { IDD = IDD_LOGVIEW };
-#endif
 
 BEGIN_MSG_MAP(CLogView)
 	MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
     MESSAGE_HANDLER(WM_SIZE, OnSize)
     MESSAGE_HANDLER(WM_CTLCOLORSTATIC,OnCtlColor)
     MESSAGE_HANDLER(WM_CTLCOLOREDIT,OnCtlColor)
-#if defined(OS_WINDOWS_DESKTOP)
-	MESSAGE_HANDLER(WM_SIZING, OnSizing)
-	MESSAGE_HANDLER(WM_CLOSE,OnClose)
-	MESSAGE_HANDLER(WM_TIMER, OnTimer)
-	MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnPosChanged)
-	MESSAGE_HANDLER(WM_FIND_TEXT,OnFindText)
-	MESSAGE_HANDLER(WM_NOTIFY, OnNotify)
-
-	COMMAND_ID_HANDLER(ID_MENU_COPY, OnCopy)
-	COMMAND_ID_HANDLER(ID_MENU_SELECTALL, OnSelectAll)
-	COMMAND_ID_HANDLER(ID_MENU_FIND, OnFind)
-#endif
     COMMAND_ID_HANDLER(IDM_BACK, OnBack)
     COMMAND_ID_HANDLER(IDM_OPTIONS, OnOptions)
     COMMAND_ID_HANDLER(IDM_SENDLOG, OnSendLog)
     COMMAND_ID_HANDLER(IDM_REFRESH, OnRefresh)
     COMMAND_ID_HANDLER(IDM_CLEAR, OnClear)
@@ -170,22 +88,10 @@
    	LRESULT OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 #endif
 
 	LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnCtlColor(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
-#if defined(OS_WINDOWS_DESKTOP)
-	LRESULT OnSizing(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-	LRESULT OnPosChanged(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
-	LRESULT OnClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
-	LRESULT OnTimer(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
-	LRESULT OnFindText(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
-	LRESULT OnNotify(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& bHandled);
-
-	LRESULT OnCopy(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
-	LRESULT OnSelectAll(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
-	LRESULT OnFind(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
-#endif
     virtual void OnFinalMessage(HWND /*hWnd*/);
 
 #if 0 //defined(_DEVICE_RESOLUTION_AWARE) && !defined(WIN32_PLATFORM_WFSP)
 	LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 	{
@@ -194,21 +100,6 @@
 			m_hWnd, 
 			DRA::GetDisplayMode() != DRA::Portrait ? MAKEINTRESOURCE(IDD_LOGVIEW_WIDE) : MAKEINTRESOURCE(IDD_LOGVIEW));
 		return 0;
 	}
 #endif
-#if defined(OS_WINDOWS_DESKTOP)
-protected:
-  CResizableGrip m_grip;
-  CFindReplaceDialog *m_pFindDialog;
-  rho::StringW m_findText;
-  WPARAM m_findParams;
-#endif
 };
-
-#if defined(OS_WINDOWS_DESKTOP)
-
-int  getIniInt(LPCTSTR lpKeyName, int nDefault);
-void setIniInt(LPCTSTR lpKeyName, int nValue);
-
-#endif
-