summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2009-01-03 03:54:03 +0100
committerWilliam A. Rowe Jr <wrowe@apache.org>2009-01-03 03:54:03 +0100
commita5f3f9e1710bc334f7b3a930532a6851ac9c7e47 (patch)
tree1b520630d2026c4f2f8c28c8e4cb7f5f1774aa18
parentRemove console/win9x support from ApacheMonitor, now Service Control only (diff)
downloadapache2-a5f3f9e1710bc334f7b3a930532a6851ac9c7e47.tar.xz
apache2-a5f3f9e1710bc334f7b3a930532a6851ac9c7e47.zip
Drop some lingering pre-NT conditionals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730895 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--support/win32/ApacheMonitor.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index 02a591403d..57729b78b2 100644
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -433,11 +433,9 @@ void ShowTryPopupMenu(HWND hWnd)
appendMenuItem(hMenu, IDM_RESTORE,
g_lpMsg[IDS_MSG_MNUSHOW - IDS_MSG_FIRST],
TRUE, TRUE);
- if (g_dwOSVersion >= OS_VERSION_WINNT) {
- appendMenuItem(hMenu, IDC_SMANAGER,
- g_lpMsg[IDS_MSG_MNUSERVICES - IDS_MSG_FIRST],
- FALSE, TRUE);
- }
+ appendMenuItem(hMenu, IDC_SMANAGER,
+ g_lpMsg[IDS_MSG_MNUSERVICES - IDS_MSG_FIRST],
+ FALSE, TRUE);
appendMenuItem(hMenu, 0, _T(""), FALSE, TRUE);
appendMenuItem(hMenu, IDM_EXIT,
g_lpMsg[IDS_MSG_MNUEXIT - IDS_MSG_FIRST],
@@ -1000,12 +998,6 @@ LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message,
g_lpMsg[IDS_MSG_CONNECT - IDS_MSG_FIRST]);
SetWindowText(GetDlgItem(hDlg, IDC_SEXIT),
g_lpMsg[IDS_MSG_MNUEXIT - IDS_MSG_FIRST]);
- if (g_dwOSVersion < OS_VERSION_WINNT)
- {
- ShowWindow(GetDlgItem(hDlg, IDC_SMANAGER), SW_HIDE);
- ShowWindow(GetDlgItem(hDlg, IDC_SCONNECT), SW_HIDE);
- ShowWindow(GetDlgItem(hDlg, IDC_SDISCONN), SW_HIDE);
- }
hListBox = GetDlgItem(hDlg, IDL_SERVICES);
g_hwndStdoutList = GetDlgItem(hDlg, IDL_STDOUT);
hStatusBar = CreateStatusWindow(0x0800 /* SBT_TOOLTIPS */