lcl: move calculator images from Lazarus to FPC resources

git-svn-id: trunk@42965 -

.gitattributes

@@ -6728,7 +6728,7 @@ lcl/lazhelphtml.pas svneol=native#text/pascal
 lcl/lazhelpintf.pas svneol=native#text/pascal
 lcl/lazlinkedlist.pas svneol=native#text/pascal
 lcl/lazregions.pas svneol=native#text/pascal
-lcl/lcl_calc_images.lrs svneol=native#text/pascal
+lcl/lcl_calc_images.res -text
 lcl/lcl_dbgrid_images.lrs svneol=native#text/pascal
 lcl/lcl_dbnav_images.lrs svneol=native#text/pascal
 lcl/lcl_dock_images.lrs svneol=native#text/pascal

lcl/extdlgs.pas

@@ -236,7 +236,11 @@ Type
 procedure Register;
 
 implementation
-uses WSExtDlgs;
+
+{$R lcl_calc_images.res}
+
+uses 
+  WSExtDlgs;
 
 procedure Register;
 begin
@@ -671,9 +675,13 @@ begin
             if (BtnGlyphs[ALayout,Kind]<>'') then
             begin
               Caption:='';
-              Bitmap := CreateBitmapFromLazarusResource(BtnGlyphs[ALayout,Kind]);
-              Glyph.Assign(Bitmap);
-              Bitmap.Free;
+              Bitmap := TPixmap.Create;
+              try
+                Bitmap.LoadFromResourceName(hInstance, BtnGlyphs[ALayout,Kind]);
+                Glyph.Assign(Bitmap);
+              finally
+                Bitmap.Free;
+              end;
             end;
         end
         else
@@ -730,10 +738,7 @@ end;
 class procedure TCalculatorPanel.WSRegisterClass;
 begin
   inherited WSRegisterClass;
-  if RegisterCalculatorPanel then
-  begin
-    {$i lcl_calc_images.lrs}
-  end;
+  RegisterCalculatorPanel;
 end;
 
 procedure TCalculatorPanel.ErrorBeep;

lcl/images/lcl_edbtnimg.bat

@@ -1 +1 @@
-..\..\tools\lazres ..\lcl_edbtnimg.rc @lcl_edbtnimg_list.txt
+..\..\tools\lazres lcl_edbtnimg.rc @lcl_edbtnimg_list.txt

lcl/lcl_calc_images.lrs

@@ -1,50 +0,0 @@
-{ Resources for calculator }
-LazarusResources.Add('btncalccancel','XPM',[
-  '/* XPM */'#10'static char *calccancel[] = {'#10'/* columns rows colors chars'
-  +'-per-pixel */'#10'"11 13 2 1",'#10'"  c black",'#10'"> c None",'#10'/* pixe'
-  +'ls */'#10'">>>>>>>>>>>",'#10'">>>>>>>>>>>",'#10'">  >>>>>  >",'#10'">   >>>'
-  +'   >",'#10'">>   >   >>",'#10'">>>     >>>",'#10'">>>>   >>>>",'#10'">>>   '
-  +'  >>>",'#10'">>   >   >>",'#10'">   >>>   >",'#10'">  >>>>>  >",'#10'">>>>>'
-  +'>>>>>>",'#10'">>>>>>>>>>>"'#10'};'#10
-]);
-LazarusResources.Add('btncalcmin','XPM',[
-  '/* XPM */'#10'static char *calcmin[] = {'#10'/* columns rows colors chars-pe'
-  +'r-pixel */'#10'"10 13 2 1",'#10'"+ c black",'#10'"> c None",'#10'/* pixels '
-  +'*/'#10'">>>>>>>>>>",'#10'">>>>>>>>>>",'#10'">>>>>>>>>>",'#10'">>>>>>>>>>",'
-  +#10'">>>>>>>>>>",'#10'">++++++++>",'#10'">++++++++>",'#10'">>>>>>>>>>",'#10
-  +'">>>>>>>>>>",'#10'">>>>>>>>>>",'#10'">>>>>>>>>>",'#10'">>>>>>>>>>",'#10'">>'
-  +'>>>>>>>>"'#10'};'#10
-]);
-LazarusResources.Add('btncalcmul','XPM',[
-  '/* XPM */'#10'static char *calcmul[] = {'#10'/* columns rows colors chars-pe'
-  +'r-pixel */'#10'"9 13 2 1",'#10'"+ c black",'#10'"> c None",'#10'/* pixels *'
-  +'/'#10'">>>>>>>>>",'#10'">>>>>>>>>",'#10'">>>>>>>>>",'#10'">++>>>++>",'#10'"'
-  +'>+++>+++>",'#10'">>+++++>>",'#10'">>>+++>>>",'#10'">>+++++>>",'#10'">+++>++'
-  +'+>",'#10'">++>>>++>",'#10'">>>>>>>>>",'#10'">>>>>>>>>",'#10'">>>>>>>>>"'#10
-  +'};'#10
-]);
-LazarusResources.Add('btncalcok','XPM',[
-  '/* XPM */'#10'static char *calcok[] = {'#10'/* columns rows colors chars-per'
-  +'-pixel */'#10'"13 13 2 1",'#10'"  c black",'#10'"> c None",'#10'/* pixels *'
-  +'/'#10'">>>>>>>>>>>>>",'#10'">>>>>>>>>>>>>",'#10'">>>>>>>>>>  >",'#10'">>>>>'
-  +'>>>>   >",'#10'">>>>>>>>   >>",'#10'">>>>>>>   >>>",'#10'">  >>>   >>>>",'
-  +#10'">   >   >>>>>",'#10'">>     >>>>>>",'#10'">>>   >>>>>>>",'#10'">>>> >>>'
-  +'>>>>>",'#10'">>>>>>>>>>>>>",'#10'">>>>>>>>>>>>>"'#10'};'#10
-]);
-LazarusResources.Add('btncalcplus','XPM',[
-  '/* XPM */'#10'static char *calcplus[] = {'#10'/* columns rows colors chars-p'
-  +'er-pixel */'#10'"10 13 2 1",'#10'"+ c black",'#10'"> c None",'#10'/* pixels'
-  +' */'#10'">>>>>>>>>>",'#10'">>>>>>>>>>",'#10'">>>>++>>>>",'#10'">>>>++>>>>",'
-  +#10'">>>>++>>>>",'#10'">++++++++>",'#10'">++++++++>",'#10'">>>>++>>>>",'#10
-  +'">>>>++>>>>",'#10'">>>>++>>>>",'#10'">>>>>>>>>>",'#10'">>>>>>>>>>",'#10'">>'
-  +'>>>>>>>>"'#10'};'#10
-]);
-LazarusResources.Add('btncalcpmin','XPM',[
-  '/* XPM */'#10'static char *calcpmin[] = {'#10'/* columns rows colors chars-per'
-  +'-pixel */'#10'"10 13 2 1",'#10'"  c black",'#10'"> c None",'#10'/* pixels *'
-  +'/'#10'">>>>>>>>>>",'#10'">>>>  >>>>",'#10'">>>>  >>>>",'#10'">>>>  >>>>",'
-  +#10'">        >",'#10'">        >",'#10'">>>>  >>>>",'#10'">>>>  >>>>",'#10
-  +'">>>>  >>>>",'#10'">>>>>>>>>>",'#10'">        >",'#10'">        >",'#10'">>'
-  +'>>>>>>>>"'#10'};'#10
-]);
-