From 452122a506250077ddeb429b0631174aaaf4529b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 29 Jun 2008 09:32:30 +0000 Subject: [PATCH] Use __REACTOS__ define instead of _ROS_ one svn path=/trunk/; revision=34179 --- reactos/base/shell/explorer/explorer.rbuild | 1 - .../base/shell/explorer/shell/mainframe.cpp | 4 ++-- .../base/shell/explorer/taskbar/desktopbar.cpp | 6 +++--- .../base/shell/explorer/taskbar/desktopbar.h | 6 +++--- .../base/shell/explorer/taskbar/startmenu.cpp | 18 +++++++++--------- .../base/shell/explorer/taskbar/taskbar.cpp | 2 +- .../base/shell/explorer/utility/utility.cpp | 2 +- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/reactos/base/shell/explorer/explorer.rbuild b/reactos/base/shell/explorer/explorer.rbuild index 85b32587fcc..5fccd6d6c7e 100644 --- a/reactos/base/shell/explorer/explorer.rbuild +++ b/reactos/base/shell/explorer/explorer.rbuild @@ -7,7 +7,6 @@ . - 0x0600 0x0501 0x0500 diff --git a/reactos/base/shell/explorer/shell/mainframe.cpp b/reactos/base/shell/explorer/shell/mainframe.cpp index 6a432686587..b9c0b6478bf 100644 --- a/reactos/base/shell/explorer/shell/mainframe.cpp +++ b/reactos/base/shell/explorer/shell/mainframe.cpp @@ -300,7 +300,7 @@ bool MainFrameBase::ProcessMessage(UINT nmsg, WPARAM wparam, LPARAM lparam, LRES break; case WM_SIZE: { -#ifdef _ROS_ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed +#ifdef __REACTOS__ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); #else @@ -788,7 +788,7 @@ MDIMainFrame::MDIMainFrame(HWND hwnd) extraBtns.iBitmap = 8; SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns); } -#ifndef _ROS_ // don't insert reg button for ROS. Regedit should be used. +#ifndef __REACTOS__ // don't insert reg button for ROS. Regedit should be used. // insert Registry button extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Reg.\0")); extraBtns.idCommand = ID_DRIVE_REGISTRY; diff --git a/reactos/base/shell/explorer/taskbar/desktopbar.cpp b/reactos/base/shell/explorer/taskbar/desktopbar.cpp index ad28aa3200d..cf31ab61f3e 100644 --- a/reactos/base/shell/explorer/taskbar/desktopbar.cpp +++ b/reactos/base/shell/explorer/taskbar/desktopbar.cpp @@ -41,7 +41,7 @@ DesktopBar::DesktopBar(HWND hwnd) : super(hwnd), -#ifdef _ROS_ +#ifdef __REACTOS__ _trayIcon(hwnd, ID_TRAY_VOLUME) #else WM_TASKBARCREATED(RegisterWindowMessage(WINMSG_TASKBARCREATED)) @@ -436,7 +436,7 @@ int DesktopBar::Command(int id, int code) PostMessage(_hwndQuickLaunch, PM_UPDATE_DESKTOP, desktop_idx, 0); break;} -#ifdef _ROS_ +#ifdef __REACTOS__ case ID_TRAY_VOLUME: launch_file(_hwnd, TEXT("sndvol32.exe"), SW_SHOWNORMAL); // launch volume control application break; @@ -525,7 +525,7 @@ void DesktopBar::ControlResize(WPARAM wparam, LPARAM lparam) } -#ifdef _ROS_ +#ifdef __REACTOS__ void DesktopBar::AddTrayIcons() { diff --git a/reactos/base/shell/explorer/taskbar/desktopbar.h b/reactos/base/shell/explorer/taskbar/desktopbar.h index 2cb95a4a447..f752df3644e 100644 --- a/reactos/base/shell/explorer/taskbar/desktopbar.h +++ b/reactos/base/shell/explorer/taskbar/desktopbar.h @@ -66,14 +66,14 @@ /// desktop bar window, also known as "system tray" struct DesktopBar : public -#ifdef _ROS_ +#ifdef __REACTOS__ TrayIconControllerTemplate< OwnerDrawParent > #else OwnerDrawParent #endif { -#ifdef _ROS_ +#ifdef __REACTOS__ typedef TrayIconControllerTemplate< OwnerDrawParent > super; #else @@ -110,7 +110,7 @@ protected: struct StartMenuRoot* _startMenuRoot; -#ifdef _ROS_ +#ifdef __REACTOS__ TrayIcon _trayIcon; void AddTrayIcons(); diff --git a/reactos/base/shell/explorer/taskbar/startmenu.cpp b/reactos/base/shell/explorer/taskbar/startmenu.cpp index ff257766eb0..912b2ce592d 100644 --- a/reactos/base/shell/explorer/taskbar/startmenu.cpp +++ b/reactos/base/shell/explorer/taskbar/startmenu.cpp @@ -1766,7 +1766,7 @@ LRESULT StartMenuRoot::Init(LPCREATESTRUCT pcs) #endif AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF); -#ifdef _ROS_ +#ifdef __REACTOS__ AddButton(ResString(IDS_RESTART), ICID_RESTART, false, IDC_RESTART); #endif @@ -1777,7 +1777,7 @@ LRESULT StartMenuRoot::Init(LPCREATESTRUCT pcs) #endif AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN); -#ifndef _ROS_ +#ifndef __REACTOS__ AddButton(ResString(IDS_TERMINATE), ICID_LOGOFF, false, IDC_TERMINATE); #endif @@ -1942,7 +1942,7 @@ int StartMenuHandler::Command(int id, int code) ShowLogoffDialog(g_Globals._hwndDesktopBar); break; -#ifndef _ROS_ +#ifndef __REACTOS__ case IDC_TERMINATE: DestroyWindow(GetParent(_hwnd)); break; @@ -2032,7 +2032,7 @@ int StartMenuHandler::Command(int id, int code) case IDC_CONNECTIONS: #ifndef ROSSHELL -#ifdef _ROS_ // to be removed when RAS will be implemented +#ifdef __REACTOS__ // to be removed when RAS will be implemented MessageBox(0, TEXT("RAS folder not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); #else CreateSubmenu(id, CSIDL_CONNECTIONS, ResString(IDS_CONNECTIONS)); @@ -2048,7 +2048,7 @@ int StartMenuHandler::Command(int id, int code) // browse menu case IDC_NETWORK: -#ifdef _ROS_ ///@todo to be removed when network browsing will be implemented in shell namespace +#ifdef __REACTOS__ ///@todo to be removed when network browsing will be implemented in shell namespace MessageBox(0, TEXT("network not yet implemented"), ResString(IDS_TITLE), MB_OK); #else CreateSubmenu(id, CSIDL_NETWORK, ResString(IDS_NETWORK)); @@ -2089,7 +2089,7 @@ int StartMenuHandler::Command(int id, int code) void StartMenuHandler::ShowSearchDialog() { -#ifndef _ROS_ ///@todo to be removed when SHFindFiles() will be implemented in shell32.dll +#ifndef __REACTOS__ ///@todo to be removed when SHFindFiles() will be implemented in shell32.dll static DynamicFct SHFindFiles(TEXT("SHELL32"), 90); if (SHFindFiles) @@ -2101,7 +2101,7 @@ void StartMenuHandler::ShowSearchDialog() void StartMenuHandler::ShowSearchComputer() { -#ifndef _ROS_ ///@todo to be removed when SHFindComputer() will be implemented in shell32.dll +#ifndef __REACTOS__ ///@todo to be removed when SHFindComputer() will be implemented in shell32.dll static DynamicFct SHFindComputer(TEXT("SHELL32"), 91); if (SHFindComputer) @@ -2160,7 +2160,7 @@ void SettingsMenu::AddEntries() { super::AddEntries(); -#if defined(ROSSHELL) || defined(_ROS_) // _ROS_ to be removed when printer/network will be implemented +#if defined(ROSSHELL) || defined(__REACTOS__) // __REACTOS__ to be removed when printer/network will be implemented //TODO AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS_MENU); AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS); #else @@ -2191,7 +2191,7 @@ void BrowseMenu::AddEntries() #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NONETHOOD)) // or REST_NOENTIRENETWORK ? #endif -#if defined(ROSSHELL) || defined(_ROS_) // _ROS_ to be removed when printer/network will be implemented +#if defined(ROSSHELL) || defined(__REACTOS__) // __REACTOS__ to be removed when printer/network will be implemented AddButton(ResString(IDS_NETWORK), ICID_NETWORK, false, IDC_NETWORK); #else AddButton(ResString(IDS_NETWORK), ICID_NETWORK, true, IDC_NETWORK); diff --git a/reactos/base/shell/explorer/taskbar/taskbar.cpp b/reactos/base/shell/explorer/taskbar/taskbar.cpp index e7dd94ea265..e3064a78e14 100644 --- a/reactos/base/shell/explorer/taskbar/taskbar.cpp +++ b/reactos/base/shell/explorer/taskbar/taskbar.cpp @@ -469,7 +469,7 @@ BOOL CALLBACK TaskBar::EnumWndProc(HWND hwnd, LPARAM lparam) entry._fsState = btn.fsState; -#ifdef _ROS_ // now handled by activating the ARW_HIDE flag with SystemParametersInfo(SPI_SETMINIMIZEDMETRICS) +#ifdef __REACTOS__ // now handled by activating the ARW_HIDE flag with SystemParametersInfo(SPI_SETMINIMIZEDMETRICS) // move minimized windows out of sight if (IsIconic(hwnd)) { RECT rect; diff --git a/reactos/base/shell/explorer/utility/utility.cpp b/reactos/base/shell/explorer/utility/utility.cpp index 3d2ee5dc838..fdb74c2738d 100644 --- a/reactos/base/shell/explorer/utility/utility.cpp +++ b/reactos/base/shell/explorer/utility/utility.cpp @@ -260,7 +260,7 @@ String get_windows_version_str() switch(osvi.dwPlatformId) { case VER_PLATFORM_WIN32_NT: -#ifdef _ROS_ // This work around can be removed if ReactOS gets a unique version number. +#ifdef __REACTOS__ // This work around can be removed if ReactOS gets a unique version number. str = TEXT("ReactOS"); #else if (osvi.dwMajorVersion <= 4)