ide: fix CharacterMap (#0012010)

git-svn-id: trunk@16333 -

ide/charactermapdlg.lfm

@@ -3,7 +3,7 @@ object CharacterMapDialog: TCharacterMapDialog
   Height = 397
   Top = 221
   Width = 471
-  ActiveControl = StringGrid1
+  ActiveControl = CloseButton
   Caption = 'CharacterMapDialog'
   ClientHeight = 397
   ClientWidth = 471
@@ -12,6 +12,18 @@ object CharacterMapDialog: TCharacterMapDialog
   OnCreate = FormCreate
   OnShow = FormShow
   LCLVersion = '0.9.25'
+  object CharInfoLabel: TLabel
+    AnchorSideLeft.Control = CharactersGroupbox
+    AnchorSideTop.Control = CloseButton
+    AnchorSideTop.Side = asrCenter
+    AnchorSideBottom.Side = asrBottom
+    Left = 6
+    Height = 14
+    Top = 371
+    Width = 69
+    Caption = 'CharInfoLabel'
+    ParentColor = False
+  end
   object CharactersGroupbox: TGroupBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
@@ -19,26 +31,16 @@ object CharacterMapDialog: TCharacterMapDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = CloseButton
     Left = 6
-    Height = 343
+    Height = 353
     Top = 6
     Width = 459
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
     Caption = 'Characters'
-    ClientHeight = 324
+    ClientHeight = 335
     ClientWidth = 455
     ParentCtl3D = False
     TabOrder = 0
-    object CharInfoLabel: TLabel
-      Left = 6
-      Height = 20
-      Top = 298
-      Width = 443
-      Align = alBottom
-      BorderSpacing.Around = 6
-      Caption = 'CharInfoLabel'
-      ParentColor = False
-    end
     object StringGrid1: TStringGrid
       AnchorSideLeft.Control = CharactersGroupbox
       AnchorSideTop.Control = CharactersGroupbox
@@ -47,7 +49,7 @@ object CharacterMapDialog: TCharacterMapDialog
       AnchorSideBottom.Control = CharactersGroupbox
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 312
+      Height = 323
       Top = 6
       Width = 443
       Anchors = [akTop, akLeft, akRight, akBottom]
@@ -68,10 +70,10 @@ object CharacterMapDialog: TCharacterMapDialog
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 369
+    Left = 376
-    Height = 36
+    Height = 26
-    Top = 355
+    Top = 365
-    Width = 96
+    Width = 89
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6

ide/charactermapdlg.lrs

@@ -2,34 +2,36 @@
 
 LazarusResources.Add('TCharacterMapDialog','FORMDATA',[
   'TPF0'#19'TCharacterMapDialog'#18'CharacterMapDialog'#4'Left'#3#170#1#6'Heigh'
-  +'t'#3#141#1#3'Top'#3#221#0#5'Width'#3#215#1#13'ActiveControl'#7#11'StringGri'
+  +'t'#3#141#1#3'Top'#3#221#0#5'Width'#3#215#1#13'ActiveControl'#7#11'CloseButt'
-  +'d1'#7'Caption'#6#18'CharacterMapDialog'#12'ClientHeight'#3#141#1#11'ClientW'
+  +'on'#7'Caption'#6#18'CharacterMapDialog'#12'ClientHeight'#3#141#1#11'ClientW'
   +'idth'#3#215#1#9'FormStyle'#7#11'fsStayOnTop'#10'KeyPreview'#9#8'OnCreate'#7
-  +#10'FormCreate'#6'OnShow'#7#8'FormShow'#10'LCLVersion'#6#6'0.9.25'#0#9'TGrou'
+  +#10'FormCreate'#6'OnShow'#7#8'FormShow'#10'LCLVersion'#6#6'0.9.25'#0#6'TLabe'
-  +'pBox'#18'CharactersGroupbox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Ancho'
+  +'l'#13'CharInfoLabel'#22'AnchorSideLeft.Control'#7#18'CharactersGroupbox'#21
-  +'rSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anch'
+  +'AnchorSideTop.Control'#7#11'CloseButton'#18'AnchorSideTop.Side'#7#9'asrCent'
-  +'orSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#11'CloseBut'
+  +'er'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#14#3'T'
-  +'ton'#4'Left'#2#6#6'Height'#3'W'#1#3'Top'#2#6#5'Width'#3#203#1#7'Anchors'#11
+  +'op'#3's'#1#5'Width'#2'E'#7'Caption'#6#13'CharInfoLabel'#11'ParentColor'#8#0
-  +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7
+  +#0#9'TGroupBox'#18'CharactersGroupbox'#22'AnchorSideLeft.Control'#7#5'Owner'
-  +'Caption'#6#10'Characters'#12'ClientHeight'#3'D'#1#11'ClientWidth'#3#199#1#11
+  +#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'
-  +'ParentCtl3D'#8#8'TabOrder'#2#0#0#6'TLabel'#13'CharInfoLabel'#4'Left'#2#6#6
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#11'C'
-  +'Height'#2#20#3'Top'#3'*'#1#5'Width'#3#187#1#5'Align'#7#8'alBottom'#20'Borde'
+  +'loseButton'#4'Left'#2#6#6'Height'#3'a'#1#3'Top'#2#6#5'Width'#3#203#1#7'Anch'
-  +'rSpacing.Around'#2#6#7'Caption'#6#13'CharInfoLabel'#11'ParentColor'#8#0#0#11
+  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'
-  +'TStringGrid'#11'StringGrid1'#22'AnchorSideLeft.Control'#7#18'CharactersGrou'
+  +#2#6#7'Caption'#6#10'Characters'#12'ClientHeight'#3'O'#1#11'ClientWidth'#3
-  +'pbox'#21'AnchorSideTop.Control'#7#18'CharactersGroupbox'#23'AnchorSideRight'
+  +#199#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#11'TStringGrid'#11'StringGrid1'#22
-  +'.Control'#7#18'CharactersGroupbox'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +'AnchorSideLeft.Control'#7#18'CharactersGroupbox'#21'AnchorSideTop.Control'#7
-  +#24'AnchorSideBottom.Control'#7#18'CharactersGroupbox'#21'AnchorSideBottom.S'
+  +#18'CharactersGroupbox'#23'AnchorSideRight.Control'#7#18'CharactersGroupbox'
-  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3'8'#1#3'Top'#2#6#5'Width'#3#187#1
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#18'C'
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.'
+  +'haractersGroupbox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
-  +'Around'#2#6#8'ColCount'#2#17#15'DefaultColWidth'#2#16#14'ExtendedSelect'#9
+  +'eight'#3'C'#1#3'Top'#2#6#5'Width'#3#187#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +#10'FixedColor'#7#9'clBtnFace'#7'Options'#11#15'goFixedVertLine'#15'goFixedH'
+  +'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#8'ColCount'#2#17#15'Def'
-  +'orzLine'#10'goVertLine'#10'goHorzLine'#14'goSmoothScroll'#0#8'RowCount'#2#15
+  +'aultColWidth'#2#16#14'ExtendedSelect'#9#10'FixedColor'#7#9'clBtnFace'#7'Opt'
-  +#8'TabOrder'#2#0#11'OnMouseDown'#7#20'StringGrid1MouseDown'#11'OnMouseMove'#7
+  +'ions'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLi'
-  +#20'StringGrid1MouseMove'#0#0#0#7'TBitBtn'#11'CloseButton'#23'AnchorSideRigh'
+  +'ne'#14'goSmoothScroll'#0#8'RowCount'#2#15#8'TabOrder'#2#0#11'OnMouseDown'#7
-  +'t.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSide'
+  +#20'StringGrid1MouseDown'#11'OnMouseMove'#7#20'StringGrid1MouseMove'#0#0#0#7
-  +'Bottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
+  +'TBitBtn'#11'CloseButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSi'
-  +#3'q'#1#6'Height'#2'$'#3'Top'#3'c'#1#5'Width'#2'`'#7'Anchors'#11#7'akRight'#8
+  +'deRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anc'
-  +'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'&'
+  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#3'x'#1#6'Height'#2#26#3'Top'#3'm'
-  +#195#135#195#160#195#170#195#176#195#187#195#178#195#188#4'Kind'#7#7'bkClose'
+  +#1#5'Width'#2'Y'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'Bor'
-  +#9'NumGlyphs'#2#0#7'OnClick'#7#16'CloseButtonClick'#8'TabOrder'#2#1#0#0#0
+  +'derSpacing.Around'#2#6#7'Caption'#6#15'&'#208#151#208#176#208#186#209#128
+  +#209#139#209#130#209#140#4'Kind'#7#7'bkClose'#9'NumGlyphs'#2#0#7'OnClick'#7
+  +#16'CloseButtonClick'#8'TabOrder'#2#1#0#0#0
 ]);

ide/charactermapdlg.pas

@@ -115,7 +115,7 @@ begin
   begin
     StringGrid1.MouseToCell(X, Y, Col, Row);
     if Assigned(OnInsertCharacter) then
-      OnInsertCharacter(StringGrid1.Cells[Col, Row][1]);
+      OnInsertCharacter(StringGrid1.Cells[Col, Row]);
   end;
 end;
 
@@ -129,7 +129,7 @@ begin
   begin
     StringGrid1.MouseToCell(X, Y, Col, Row);
     
-    CharOrd := Ord(StringGrid1.Cells[Col, Row][1]);
+    CharOrd := Ord(UTF8ToAnsi(StringGrid1.Cells[Col, Row])[1]);
     CharInfoLabel.Caption := 'Decimal = ' + IntToStr(CharOrd) +
                              ', Hex = $'  + HexStr(CharOrd, 2);
   end
@@ -150,7 +150,7 @@ begin
     begin
       if R = 0 then StringGrid1.Cells[C, R] := Format('%.2d', [Pred(C)])
       else
-        StringGrid1.Cells[C, R] := Chr(Succ(R) * 16 + Pred(C));
+        StringGrid1.Cells[C, R] := AnsiToUTF8(Chr(Succ(R) * 16 + Pred(C)));
     end;
   end;
 end;