LogView.h in rhodes-3.3.3

- old
+ new

@@ -27,11 +27,11 @@
 #pragma once
 
 #include "logging/RhoLogConf.h"
 #include "resource.h"
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 
 static UINT WM_FIND_TEXT = ::RegisterWindowMessage(FINDMSGSTRING);
 
 #define WS_EX_LAYOUT_RTL	0x00400000
 
@@ -76,56 +76,56 @@
 	}
 
 	static LRESULT CALLBACK GripWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
 };
-#endif //OS_WINDOWS
+#endif //OS_WINDOWS_DESKTOP
 
 // CLogView
 
 class CLogView : 
 	public CDialogImpl<CLogView>
-#if defined(OS_WINDOWS)
+#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)
+#if defined(OS_WINDOWS_DESKTOP)
 	, m_pFindDialog(NULL), m_findText(L""), m_findParams(FR_DOWN)
 #endif
 	{}
 	~CLogView(){}
 
-#if defined(OS_WINDOWS)
+#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)
+#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)
+#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)
@@ -170,11 +170,11 @@
    	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)
+#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*/);
@@ -194,19 +194,19 @@
 			m_hWnd, 
 			DRA::GetDisplayMode() != DRA::Portrait ? MAKEINTRESOURCE(IDD_LOGVIEW_WIDE) : MAKEINTRESOURCE(IDD_LOGVIEW));
 		return 0;
 	}
 #endif
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 protected:
   CResizableGrip m_grip;
   CFindReplaceDialog *m_pFindDialog;
   rho::StringW m_findText;
   WPARAM m_findParams;
 #endif
 };
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 
 int  getIniInt(LPCTSTR lpKeyName, int nDefault);
 void setIniInt(LPCTSTR lpKeyName, int nValue);
 
 #endif