--- Reverse-merging r14254 into '.':

U    rtl/unix/sysutils.pp
U    rtl/go32v2/sysutils.pp
U    rtl/win/sysutils.pp
U    rtl/os2/sysutils.pp
U    rtl/objpas/rtlconst.inc
U    rtl/objpas/sysutils/sysutilh.inc
U    rtl/objpas/sysutils/sysutils.inc

REVERSE MERGE!!!!

# revisions: 14254
------------------------------------------------------------------------
r14254 | michael | 2009-11-22 18:33:56 +0100 (Sun, 22 Nov 2009) | 1 line
Changed paths:
   M /trunk/rtl/go32v2/sysutils.pp
   M /trunk/rtl/objpas/rtlconst.inc
   M /trunk/rtl/objpas/sysutils/sysutilh.inc
   M /trunk/rtl/objpas/sysutils/sysutils.inc
   M /trunk/rtl/os2/sysutils.pp
   M /trunk/rtl/unix/sysutils.pp
   M /trunk/rtl/win/sysutils.pp

* Implemented OnBeep to install custom beep handler
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@14701 -

rtl/go32v2/sysutils.pp

@@ -635,7 +635,7 @@ end ;
                               Misc Functions
 ****************************************************************************}
 
-procedure sysBeep;
+procedure Beep;
 begin
 end;
 
@@ -844,7 +844,6 @@ end;
 Initialization
   InitExceptions;       { Initialize exceptions. OS independent }
   InitInternational;    { Initialize internationalization settings }
-  OnBeep:=@SysBeep;
 Finalization
   DoneExceptions;
 end.

rtl/objpas/rtlconst.inc

@@ -152,7 +152,6 @@ ResourceString
   SInvalidDateMonthWeek         = '(%d, %d, %d, %d) is not a valid DateMonthWeek quad';
   SInvalidDateWeek              = '(%d, %d, %d) is not a valid DateWeek triplet';
   SInvalidDayOfWeekInMonth      = '(%d, %d, %d, %d) is not a valid DayOfWeekInMonth quad';
-  SErrIllegalDateFormatString   = '"%s" is not a valid date format string';
   SInvalidFileName              = '"%s" is not a valid file name.';
   SInvalidIcon                  = 'Invalid Icon';
   SInvalidImage                 = 'Invalid stream format';

rtl/objpas/sysutils/sysutilh.inc

@@ -173,24 +173,15 @@ type
    procedure ShowException(ExceptObject: TObject; ExceptAddr: Pointer);
    procedure Abort;
    procedure OutOfMemoryError;
-
-
-Type
-   TBeepHandler = Procedure;
-
-Var
-   OnBeep : TBeephandler = Nil;
-
    procedure Beep;
    function SysErrorMessage(ErrorCode: Integer): String;
 
-
-
 Type
    TCreateGUIDFunc = Function(Out GUID : TGUID) : Integer;
-   
+
 Var
    OnCreateGUID : TCreateGUIDFunc = Nil;
+
    Function CreateGUID(out GUID : TGUID) : Integer;
 
 type

rtl/objpas/sysutils/sysutils.inc

@@ -683,11 +683,3 @@ begin
   Result:='';
 {$ENDIF}
 end;
-
-{ Beep support }
-
-procedure Beep;
-begin
-  If Assigned(OnBeep) then
-    OnBeep;
-end;

rtl/os2/sysutils.pp

@@ -836,13 +836,12 @@ end;
 {****************************************************************************
                               Misc Functions
 ****************************************************************************}
-procedure sysbeep;
 
+procedure Beep;
 begin
-  // Maybe implement later on ?
-
 end;
 
+
 {****************************************************************************
                               Locale Functions
 ****************************************************************************}
@@ -1076,7 +1075,6 @@ end;
 Initialization
   InitExceptions;       { Initialize exceptions. OS independent }
   InitInternational;    { Initialize internationalization settings }
-  OnBeep:=@SysBeep;
 Finalization
   DoneExceptions;
 end.

rtl/unix/sysutils.pp

@@ -998,6 +998,9 @@ end;
                               Misc Functions
 ****************************************************************************}
 
+procedure Beep;
+begin
+end;
 
 
 {****************************************************************************
@@ -1360,12 +1363,6 @@ begin
   Result:=TheUserDir;    
 end;
 
-Procedure SysBeep;
-
-begin
-  Write(#7);
-  Flush(Output);
-end;
 
 {****************************************************************************
                               Initialization code
@@ -1375,8 +1372,6 @@ Initialization
   InitExceptions;       { Initialize exceptions. OS independent }
   InitInternational;    { Initialize internationalization settings }
   SysConfigDir:='/etc'; { Initialize system config dir }
-  OnBeep:=@SysBeep;
-  
 Finalization
   FreeDriveStr;
   DoneExceptions;

rtl/win/sysutils.pp

@@ -604,7 +604,7 @@ end;
                               Misc Functions
 ****************************************************************************}
 
-procedure sysbeep;
+procedure Beep;
 begin
   MessageBeep(0);
 end;
@@ -1221,7 +1221,6 @@ Initialization
   InitInternational;    { Initialize internationalization settings }
   LoadVersionInfo;
   InitSysConfigDir;
-  OnBeep:=@SysBeep;
 Finalization
   DoneExceptions;
   if kernel32dll<>0 then