ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/branches/udr/client/FBMessages.pas
(Generate patch)

Comparing ibx/trunk/fbintf/client/FBMessages.pas (file contents):
Revision 47 by tony, Mon Jan 9 15:31:51 2017 UTC vs.
Revision 60 by tony, Mon Mar 27 15:21:02 2017 UTC

# Line 60 | Line 60
60   {                                                                        }
61   {************************************************************************}
62   unit FBMessages;
63 + {$IFDEF MSWINDOWS}
64 + {$DEFINE WINDOWS}
65 + {$ENDIF}
66  
67   {$IFDEF FPC}
68 < {$mode objfpc}{$H+}
68 > {$mode delphi}
69   {$codepage UTF8}
70   {$ENDIF}
71  
# Line 237 | Line 240 | type
240        ibxeInvalidParamCount,
241        ibxeInvalidVariantType,
242        ibxeServiceRunning,
243 <      ibxeUniqueRelationReqd
243 >      ibxeUniqueRelationReqd,
244 >      ibxeInterfaceNotSupported,
245 >      ibxeCharacterSetExists,
246 >      ibxeUnknownUserCharSet
247        );
248  
249 < function GetErrorMessage(ErrMess: TIBClientError): string;
249 > function GetErrorMessage(ErrMess: TIBClientError): AnsiString;
250  
251   resourcestring
252    { generic strings used in code }
# Line 433 | Line 439 | resourcestring
439    SInvalidVariantType = 'Invalid variant type';
440    SServiceRunning = 'Cannot start a new service while an existing service is running';
441    SUniqueRelationReqd = 'All Output Fields must derived from the same table';
442 +  SInterfaceNotSupported = 'Interface not supported; Guid %s not found';
443 +  SCharacterSetExists = 'Character set "%s" is already defined';
444 +  SUnknownUserCharSet = 'Unknown user character set "%s"';
445  
446   const
447    IBErrorMessages: array[TIBClientError] of string = (
# Line 595 | Line 604 | const
604      SInvalidParamCount,
605      SInvalidVariantType,
606      SServiceRunning,
607 <    SUniqueRelationReqd
607 >    SUniqueRelationReqd,
608 >    SInterfaceNotSupported,
609 >    SCharacterSetExists,
610 >    SUnknownUserCharSet
611    );
612  
613 < function GetErrorMessage(ErrMess: TIBClientError): string;
613 > function GetErrorMessage(ErrMess: TIBClientError): AnsiString;
614   begin
615    Result := IBErrorMessages[ErrMess];
616   end;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines