Update .rc file to fix build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90010 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/support/win32/ApacheMonitor.rc b/support/win32/ApacheMonitor.rc
index 21356e73e3e6ac55866395697311e4da681a0b8f..4a4e9d4e2b00bf4fb7d377b8521bb4ee4aefe747 100644 (file)
--- a/support/win32/ApacheMonitor.rc
+++ b/support/win32/ApacheMonitor.rc
@@ -1,47 +1,11 @@
-//Microsoft Developer Studio generated resource script.
-//
 #include "ApacheMonitor.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
 #include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-#include "ApacheMonitor.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1250)
-#endif //_WIN32
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
+IDI_APSRVMONM           ICON    DISCARDABLE     "ApacheMonitor.ico"
 IDI_APSMALL             ICON    DISCARDABLE     "apsmall.ico"
 IDI_APSRVMON            ICON    DISCARDABLE     "apsrvmon.ico"
 IDI_ICOSTOP             ICON    DISCARDABLE     "apstop.ico"
 IDI_ICORUN              ICON    DISCARDABLE     "aprun.ico"
-IDI_APSRVMONM           ICON    DISCARDABLE     "ApacheMonitor.ico"
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 1,0,0,1
@@ -60,17 +24,17 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "Comments", "\0"
+            VALUE "Comments", "Contributed by Mladen Turk <mturk@mappingsoft.com>\0"
             VALUE "CompanyName", "Apache Software Foundation.\0"
-            VALUE "FileDescription", "Apache Service Monitor\0"
-            VALUE "FileVersion", "1.0.0\0"
-            VALUE "InternalName", "ApSrvmon\0"
+            VALUE "FileDescription", "Apache service monitor\0"
+            VALUE "FileVersion", "1.0\0"
+            VALUE "InternalName", "apsrvmon\0"
             VALUE "LegalCopyright", "Copyright © 2001 The Apache Software Foundation.\0"
             VALUE "LegalTrademarks", "This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation.  For more information on the Apache Software Foundation, please see <http://www.apache.org/>\0"
-            VALUE "OriginalFilename", "ApSrvmon.exe\0"
+            VALUE "OriginalFilename", "apsrvmon.exe\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Apache Service Monitor\0"
-            VALUE "ProductVersion", "1.0.0\0"
+            VALUE "ProductName", "Apache service monitor\0"
+            VALUE "ProductVersion", "1.0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
@@ -80,102 +44,27 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_APSRVMON_DIALOG DIALOGEX 0, 0, 350, 159
+IDD_APSRVMON_DIALOG DIALOGEX 0, 0, 350, 174
 STYLE DS_MODALFRAME | DS_SETFOREGROUND | WS_MINIMIZEBOX | WS_VISIBLE | 
     WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "Apache service monitor"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "&OK",IDOK,298,49,50,14
-    LISTBOX         IDL_SERVICES,2,49,285,97,LBS_OWNERDRAWFIXED | 
+    LISTBOX         IDL_SERVICES,2,49,285,73,LBS_OWNERDRAWFIXED | 
                     LBS_HASSTRINGS | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | 
                     LBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
+    LISTBOX         IDL_STDOUT,2,124,285,37,LBS_NOINTEGRALHEIGHT | 
+                    LBS_DISABLENOSCROLL | LBS_NOSEL | WS_VSCROLL
     LTEXT           "Service Status :",IDC_STATIC,3,40,51,8
     PUSHBUTTON      "&Start",IDC_SSTART,298,75,50,14
     PUSHBUTTON      "S&top",IDC_SSTOP,298,91,50,14
     PUSHBUTTON      "&Restart",IDC_SRESTART,298,107,50,14
-    PUSHBUTTON      "&Uninstall",IDC_SUNINSTALL,298,132,50,14
+    PUSHBUTTON      "&About",IDC_SABOUT,298,147,50,14
     CONTROL         158,IDC_STATIC,"Static",SS_BITMAP,0,0,349,38
 END
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_BMPSTOP             BITMAP  DISCARDABLE     "sstop.bmp"
-IDB_BMPRUN              BITMAP  DISCARDABLE     "srun.bmp"
-IDB_BMPHEADER           BITMAP  DISCARDABLE     "apache_header.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_APSRVMON_DIALOG, DIALOG
-    BEGIN
-        BOTTOMMARGIN, 158
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Croatian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HRV)
-#ifdef _WIN32
-LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT
-#pragma code_page(1250)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Croatian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
 IDD_ABOUTBOX DIALOG DISCARDABLE  50, 50, 214, 114
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
@@ -194,51 +83,9 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKRECT,2,65,210,1
 END
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_ABOUTBOX, DIALOG
-    BEGIN
-        TOPMARGIN, 3
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "#include ""windows.h""\r\n"
-    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "#include ""resource.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
+IDB_BMPSTOP             BITMAP  DISCARDABLE     "sstop.bmp"
+IDB_BMPRUN              BITMAP  DISCARDABLE     "srun.bmp"
+IDB_BMPHEADER           BITMAP  DISCARDABLE     "apache_header.bmp"
 
 IDC_APSRVMON MENU DISCARDABLE 
 BEGIN
@@ -253,28 +100,16 @@ BEGIN
     END
 END
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
 IDC_APSRVMON ACCELERATORS MOVEABLE PURE 
 BEGIN
     "?",            IDM_ABOUT,              ASCII,  ALT
     "/",            IDM_ABOUT,              ASCII,  ALT
 END
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_APP_TITLE           "Apache Service Monitor"
-    IDC_APSRVMON            "ApacheServiceMonitor"
+    IDS_APP_TITLE           "Apache service monitor"
+    IDC_APSRVMON            "ApacheServiceMonitorClass"
     IDS_VERSION_ERROR       "Error %lu"
 END
 
@@ -282,19 +117,3 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_VER_INFO_LANG       "\\StringFileInfo\\000004B0\\"
 END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-