Browse Source

* disable the new FindResource(Ex) overloads for Win16 for now (the one with PChar is disabled as well); this will need to be revisited once Win16 receives proper resource support

git-svn-id: trunk@45489 -
svenbarth 5 years ago
parent
commit
e82b9c3b2e
2 changed files with 4 additions and 0 deletions
  1. 2 0
      rtl/inc/resh.inc
  2. 2 0
      rtl/inc/sysres.inc

+ 2 - 0
rtl/inc/resh.inc

@@ -78,10 +78,12 @@ Function FreeResource(ResData: TFPResourceHGLOBAL): LongBool;
 {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}
 Function FindResource(ModuleHandle: TFPResourceHMODULE; const ResourceName, ResourceType: AnsiString): TFPResourceHandle;
 Function FindResourceEx(ModuleHandle: TFPResourceHMODULE; const ResourceType, ResourceName: AnsiString; Language : word): TFPResourceHandle;
+{$ifndef Win16}
 Function FindResource(ModuleHandle: TFPResourceHMODULE; const ResourceName: AnsiString; ResourceType: PChar): TFPResourceHandle;
 Function FindResourceEx(ModuleHandle: TFPResourceHMODULE; ResourceType: PChar; const ResourceName: AnsiString; Language : word): TFPResourceHandle;
 Function FindResource(ModuleHandle: TFPResourceHMODULE; ResourceName: PChar; const ResourceType: AnsiString): TFPResourceHandle;
 Function FindResourceEx(ModuleHandle: TFPResourceHMODULE; const ResourceType: AnsiString; ResourceName: PChar; Language : word): TFPResourceHandle;
+{$endif Win16}
 {$endif}
 
 type

+ 2 - 0
rtl/inc/sysres.inc

@@ -44,6 +44,7 @@ begin
   Result:=FindResourceEx(ModuleHandle,PChar(ResourceType),PChar(ResourceName),Language);
 end;
 
+{$ifndef Win16}
 Function FindResource(ModuleHandle: TFPResourceHMODULE; const ResourceName: AnsiString; ResourceType: PChar): TFPResourceHandle;
 
 begin
@@ -67,6 +68,7 @@ Function FindResourceEx(ModuleHandle: TFPResourceHMODULE; const ResourceType: An
 begin
   Result:=FindResourceEx(ModuleHandle,PChar(ResourceType),ResourceName,Language);
 end;
+{$endif Win16}
 {$endif}
 
 (*****************************************************************************