mirror of
https://github.com/reactos/reactos.git
synced 2024-09-11 05:12:43 +00:00
Use __REACTOS__ define instead of _ROS_ one
svn path=/trunk/; revision=34179
This commit is contained in:
parent
16d2ca207f
commit
452122a506
|
@ -7,7 +7,6 @@
|
||||||
<include base="explorer">.</include>
|
<include base="explorer">.</include>
|
||||||
<define name="UNICODE" />
|
<define name="UNICODE" />
|
||||||
<define name="WIN32" />
|
<define name="WIN32" />
|
||||||
<define name="_ROS_" />
|
|
||||||
<define name="_WIN32_IE">0x0600</define>
|
<define name="_WIN32_IE">0x0600</define>
|
||||||
<define name="_WIN32_WINNT">0x0501</define>
|
<define name="_WIN32_WINNT">0x0501</define>
|
||||||
<define name="WINVER">0x0500</define>
|
<define name="WINVER">0x0500</define>
|
||||||
|
|
|
@ -300,7 +300,7 @@ bool MainFrameBase::ProcessMessage(UINT nmsg, WPARAM wparam, LPARAM lparam, LRES
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_SIZE: {
|
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);
|
int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0);
|
||||||
MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE);
|
MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE);
|
||||||
#else
|
#else
|
||||||
|
@ -788,7 +788,7 @@ MDIMainFrame::MDIMainFrame(HWND hwnd)
|
||||||
extraBtns.iBitmap = 8;
|
extraBtns.iBitmap = 8;
|
||||||
SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns);
|
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
|
// insert Registry button
|
||||||
extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Reg.\0"));
|
extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Reg.\0"));
|
||||||
extraBtns.idCommand = ID_DRIVE_REGISTRY;
|
extraBtns.idCommand = ID_DRIVE_REGISTRY;
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
|
|
||||||
DesktopBar::DesktopBar(HWND hwnd)
|
DesktopBar::DesktopBar(HWND hwnd)
|
||||||
: super(hwnd),
|
: super(hwnd),
|
||||||
#ifdef _ROS_
|
#ifdef __REACTOS__
|
||||||
_trayIcon(hwnd, ID_TRAY_VOLUME)
|
_trayIcon(hwnd, ID_TRAY_VOLUME)
|
||||||
#else
|
#else
|
||||||
WM_TASKBARCREATED(RegisterWindowMessage(WINMSG_TASKBARCREATED))
|
WM_TASKBARCREATED(RegisterWindowMessage(WINMSG_TASKBARCREATED))
|
||||||
|
@ -436,7 +436,7 @@ int DesktopBar::Command(int id, int code)
|
||||||
PostMessage(_hwndQuickLaunch, PM_UPDATE_DESKTOP, desktop_idx, 0);
|
PostMessage(_hwndQuickLaunch, PM_UPDATE_DESKTOP, desktop_idx, 0);
|
||||||
break;}
|
break;}
|
||||||
|
|
||||||
#ifdef _ROS_
|
#ifdef __REACTOS__
|
||||||
case ID_TRAY_VOLUME:
|
case ID_TRAY_VOLUME:
|
||||||
launch_file(_hwnd, TEXT("sndvol32.exe"), SW_SHOWNORMAL); // launch volume control application
|
launch_file(_hwnd, TEXT("sndvol32.exe"), SW_SHOWNORMAL); // launch volume control application
|
||||||
break;
|
break;
|
||||||
|
@ -525,7 +525,7 @@ void DesktopBar::ControlResize(WPARAM wparam, LPARAM lparam)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef _ROS_
|
#ifdef __REACTOS__
|
||||||
|
|
||||||
void DesktopBar::AddTrayIcons()
|
void DesktopBar::AddTrayIcons()
|
||||||
{
|
{
|
||||||
|
|
|
@ -66,14 +66,14 @@
|
||||||
|
|
||||||
/// desktop bar window, also known as "system tray"
|
/// desktop bar window, also known as "system tray"
|
||||||
struct DesktopBar : public
|
struct DesktopBar : public
|
||||||
#ifdef _ROS_
|
#ifdef __REACTOS__
|
||||||
TrayIconControllerTemplate<
|
TrayIconControllerTemplate<
|
||||||
OwnerDrawParent<Window> >
|
OwnerDrawParent<Window> >
|
||||||
#else
|
#else
|
||||||
OwnerDrawParent<Window>
|
OwnerDrawParent<Window>
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
#ifdef _ROS_
|
#ifdef __REACTOS__
|
||||||
typedef TrayIconControllerTemplate<
|
typedef TrayIconControllerTemplate<
|
||||||
OwnerDrawParent<Window> > super;
|
OwnerDrawParent<Window> > super;
|
||||||
#else
|
#else
|
||||||
|
@ -110,7 +110,7 @@ protected:
|
||||||
|
|
||||||
struct StartMenuRoot* _startMenuRoot;
|
struct StartMenuRoot* _startMenuRoot;
|
||||||
|
|
||||||
#ifdef _ROS_
|
#ifdef __REACTOS__
|
||||||
TrayIcon _trayIcon;
|
TrayIcon _trayIcon;
|
||||||
|
|
||||||
void AddTrayIcons();
|
void AddTrayIcons();
|
||||||
|
|
|
@ -1766,7 +1766,7 @@ LRESULT StartMenuRoot::Init(LPCREATESTRUCT pcs)
|
||||||
#endif
|
#endif
|
||||||
AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF);
|
AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF);
|
||||||
|
|
||||||
#ifdef _ROS_
|
#ifdef __REACTOS__
|
||||||
AddButton(ResString(IDS_RESTART), ICID_RESTART, false, IDC_RESTART);
|
AddButton(ResString(IDS_RESTART), ICID_RESTART, false, IDC_RESTART);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1777,7 +1777,7 @@ LRESULT StartMenuRoot::Init(LPCREATESTRUCT pcs)
|
||||||
#endif
|
#endif
|
||||||
AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN);
|
AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN);
|
||||||
|
|
||||||
#ifndef _ROS_
|
#ifndef __REACTOS__
|
||||||
AddButton(ResString(IDS_TERMINATE), ICID_LOGOFF, false, IDC_TERMINATE);
|
AddButton(ResString(IDS_TERMINATE), ICID_LOGOFF, false, IDC_TERMINATE);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1942,7 +1942,7 @@ int StartMenuHandler::Command(int id, int code)
|
||||||
ShowLogoffDialog(g_Globals._hwndDesktopBar);
|
ShowLogoffDialog(g_Globals._hwndDesktopBar);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#ifndef _ROS_
|
#ifndef __REACTOS__
|
||||||
case IDC_TERMINATE:
|
case IDC_TERMINATE:
|
||||||
DestroyWindow(GetParent(_hwnd));
|
DestroyWindow(GetParent(_hwnd));
|
||||||
break;
|
break;
|
||||||
|
@ -2032,7 +2032,7 @@ int StartMenuHandler::Command(int id, int code)
|
||||||
|
|
||||||
case IDC_CONNECTIONS:
|
case IDC_CONNECTIONS:
|
||||||
#ifndef ROSSHELL
|
#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);
|
MessageBox(0, TEXT("RAS folder not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK);
|
||||||
#else
|
#else
|
||||||
CreateSubmenu(id, CSIDL_CONNECTIONS, ResString(IDS_CONNECTIONS));
|
CreateSubmenu(id, CSIDL_CONNECTIONS, ResString(IDS_CONNECTIONS));
|
||||||
|
@ -2048,7 +2048,7 @@ int StartMenuHandler::Command(int id, int code)
|
||||||
// browse menu
|
// browse menu
|
||||||
|
|
||||||
case IDC_NETWORK:
|
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);
|
MessageBox(0, TEXT("network not yet implemented"), ResString(IDS_TITLE), MB_OK);
|
||||||
#else
|
#else
|
||||||
CreateSubmenu(id, CSIDL_NETWORK, ResString(IDS_NETWORK));
|
CreateSubmenu(id, CSIDL_NETWORK, ResString(IDS_NETWORK));
|
||||||
|
@ -2089,7 +2089,7 @@ int StartMenuHandler::Command(int id, int code)
|
||||||
|
|
||||||
void StartMenuHandler::ShowSearchDialog()
|
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> SHFindFiles(TEXT("SHELL32"), 90);
|
static DynamicFct<SHFINDFILES> SHFindFiles(TEXT("SHELL32"), 90);
|
||||||
|
|
||||||
if (SHFindFiles)
|
if (SHFindFiles)
|
||||||
|
@ -2101,7 +2101,7 @@ void StartMenuHandler::ShowSearchDialog()
|
||||||
|
|
||||||
void StartMenuHandler::ShowSearchComputer()
|
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> SHFindComputer(TEXT("SHELL32"), 91);
|
static DynamicFct<SHFINDCOMPUTER> SHFindComputer(TEXT("SHELL32"), 91);
|
||||||
|
|
||||||
if (SHFindComputer)
|
if (SHFindComputer)
|
||||||
|
@ -2160,7 +2160,7 @@ void SettingsMenu::AddEntries()
|
||||||
{
|
{
|
||||||
super::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);
|
//TODO AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS_MENU);
|
||||||
AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS);
|
AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS);
|
||||||
#else
|
#else
|
||||||
|
@ -2191,7 +2191,7 @@ void BrowseMenu::AddEntries()
|
||||||
#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)
|
#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)
|
||||||
if (!g_Globals._SHRestricted || !SHRestricted(REST_NONETHOOD)) // or REST_NOENTIRENETWORK ?
|
if (!g_Globals._SHRestricted || !SHRestricted(REST_NONETHOOD)) // or REST_NOENTIRENETWORK ?
|
||||||
#endif
|
#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);
|
AddButton(ResString(IDS_NETWORK), ICID_NETWORK, false, IDC_NETWORK);
|
||||||
#else
|
#else
|
||||||
AddButton(ResString(IDS_NETWORK), ICID_NETWORK, true, IDC_NETWORK);
|
AddButton(ResString(IDS_NETWORK), ICID_NETWORK, true, IDC_NETWORK);
|
||||||
|
|
|
@ -469,7 +469,7 @@ BOOL CALLBACK TaskBar::EnumWndProc(HWND hwnd, LPARAM lparam)
|
||||||
|
|
||||||
entry._fsState = btn.fsState;
|
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
|
// move minimized windows out of sight
|
||||||
if (IsIconic(hwnd)) {
|
if (IsIconic(hwnd)) {
|
||||||
RECT rect;
|
RECT rect;
|
||||||
|
|
|
@ -260,7 +260,7 @@ String get_windows_version_str()
|
||||||
|
|
||||||
switch(osvi.dwPlatformId) {
|
switch(osvi.dwPlatformId) {
|
||||||
case VER_PLATFORM_WIN32_NT:
|
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");
|
str = TEXT("ReactOS");
|
||||||
#else
|
#else
|
||||||
if (osvi.dwMajorVersion <= 4)
|
if (osvi.dwMajorVersion <= 4)
|
||||||
|
|
Loading…
Reference in a new issue