--- 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
--- Merging r14271 into '.':
U    rtl/wince/sysutils.pp
--- Merging r14541 into '.':
U    rtl/morphos/sysutils.pp

# revisions: 14254,14271,14541
------------------------------------------------------------------------
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
------------------------------------------------------------------------
------------------------------------------------------------------------
r14271 | michael | 2009-11-25 10:37:04 +0100 (Wed, 25 Nov 2009) | 1 line
Changed paths:
   M /trunk/rtl/wince/sysutils.pp

* Fixed OnBeep
------------------------------------------------------------------------
------------------------------------------------------------------------
r14541 | karoly | 2010-01-05 00:42:16 +0100 (Tue, 05 Jan 2010) | 2 lines
Changed paths:
   M /trunk/rtl/morphos/sysutils.pp

+ removed empty Beep(); function, uses OnBeep now, sysutils should compile again

------------------------------------------------------------------------

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

rtl/go32v2/sysutils.pp

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

rtl/morphos/sysutils.pp

@@ -507,15 +507,6 @@ end;
 
 
 
-{****************************************************************************
-                              Misc Functions
-****************************************************************************}
-
-procedure Beep;
-begin
-end;
-
-
 {****************************************************************************
                               Locale Functions
 ****************************************************************************}
@@ -663,6 +654,8 @@ end;
 Initialization
   InitExceptions;
   InitInternational;    { Initialize internationalization settings }
+  OnBeep:=Nil;          { No SysBeep() on MorphOS, for now. Figure out if we want 
+                          to use intuition.library/DisplayBeep() for this (KB) }
 Finalization
   DoneExceptions;
 end.

rtl/objpas/rtlconst.inc

@@ -152,6 +152,7 @@ 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

@@ -209,15 +209,24 @@ 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

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

rtl/os2/sysutils.pp

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

rtl/unix/sysutils.pp

@@ -999,9 +999,6 @@ end;
                               Misc Functions
 ****************************************************************************}
 
-procedure Beep;
-begin
-end;
 
 
 {****************************************************************************
@@ -1364,6 +1361,12 @@ begin
   Result:=TheUserDir;    
 end;
 
+Procedure SysBeep;
+
+begin
+  Write(#7);
+  Flush(Output);
+end;
 
 {****************************************************************************
                               Initialization code
@@ -1373,6 +1376,8 @@ 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

@@ -589,7 +589,7 @@ end;
                               Misc Functions
 ****************************************************************************}
 
-procedure Beep;
+procedure sysbeep;
 begin
   MessageBeep(0);
 end;
@@ -1258,6 +1258,7 @@ Initialization
   InitInternational;    { Initialize internationalization settings }
   LoadVersionInfo;
   InitSysConfigDir;
+  OnBeep:=@SysBeep;
 Finalization
   DoneExceptions;
 end.

rtl/wince/sysutils.pp

@@ -467,7 +467,7 @@ end;
                               Misc Functions
 ****************************************************************************}
 
-procedure Beep;
+procedure SysBeep;
 begin
   MessageBeep(0);
 end;
@@ -953,6 +953,7 @@ Initialization
   InitExceptions;       { Initialize exceptions. OS independent }
   InitInternational;    { Initialize internationalization settings }
   LoadVersionInfo;
+  OnBeep:=@SysBeep;
   SysConfigDir:='\Windows';
 
 Finalization