From e8fdcb7c63b711dd074be41cc31bc85f42f135c0 Mon Sep 17 00:00:00 2001
From: dkolmck <dkolmck@91bb2d04-0c0c-4d2d-88a5-bbb6f4c1fa07>
Date: Thu, 15 Apr 2010 13:00:34 +0000
Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/kolmck/code@61
 91bb2d04-0c0c-4d2d-88a5-bbb6f4c1fa07

---
 Addons/KOLCCtrls.pas     |  1 +
 Addons/KOLFontEditor.pas |  2 +-
 Addons/addons_D2010.dpk  | 26 ++++++--------------------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/Addons/KOLCCtrls.pas b/Addons/KOLCCtrls.pas
index 0b429c8..ba821e9 100644
--- a/Addons/KOLCCtrls.pas
+++ b/Addons/KOLCCtrls.pas
@@ -1,4 +1,5 @@
 unit KOLCCtrls;
+{$UNDEF UNICODE}
 
 interface
 
diff --git a/Addons/KOLFontEditor.pas b/Addons/KOLFontEditor.pas
index f284d6c..793e83d 100644
--- a/Addons/KOLFontEditor.pas
+++ b/Addons/KOLFontEditor.pas
@@ -340,7 +340,7 @@ begin
   if Result then
   begin
     DeleteObject(Font.Handle);
-    Font.Handle := CreateFontIndirect(TMPLogFont);
+    Font.Handle := CreateFontIndirectA(TMPLogFont);
     Font.Color := Color;
   end;
 end;
diff --git a/Addons/addons_D2010.dpk b/Addons/addons_D2010.dpk
index 8b5b3ee..0b8d7f9 100644
--- a/Addons/addons_D2010.dpk
+++ b/Addons/addons_D2010.dpk
@@ -1,6 +1,7 @@
 package addons_D2010;
 
-{$R addons.res}
+{$R *.res}
+{$R 'addons.res'}
 {$R 'mckCCtrls.dcr'}
 {$R 'mckHTTPDownload.dcr'}
 {$R 'mckQProgBar.dcr'}
@@ -24,11 +25,12 @@ package addons_D2010;
 {$VARSTRINGCHECKS ON}
 {$WRITEABLECONST OFF}
 {$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
+{$IMAGEBASE $8400000}
 {$DESCRIPTION 'KOLADDONS_D2010'}
 {$DESIGNONLY}
 {$IMPLICITBUILD ON}
 {$DEFINE INPACKAGE}
+{$DEFINE unicode_ctrls}
 
 requires
   rtl,
@@ -40,26 +42,17 @@ requires
   designide;
 
 contains
-  KOLCCtrls in 'KOLCCtrls.pas',
-  mckCCtrls in 'mckCCtrls.pas',
   KOLHashs in 'KOLHashs.PAS',
   mckHashs in 'mckHashs.pas',
   KOLFontEditor in 'KOLFontEditor.pas',
   KOLmhxp in 'KOLmhxp.pas',
   MCKMHXP in 'MCKMHXP.pas',
-  mckTCPSocket in 'mckTCPSocket.pas',
-  mckSocket in 'mckSocket.pas',
   mckListEdit in 'mckListEdit.pas',
-  KOLSocket in 'KOLSocket.pas',
   Objects in 'Objects.pas',
-  kolTCPSocket in 'kolTCPSocket.pas',
   mckCProgBar in 'mckCProgBar.pas',
   mckRarInfoBar in 'mckRarInfoBar.pas',
   mckRarProgBar in 'mckRarProgBar.pas',
   mckHTTP in 'mckHTTP.pas',
-  mckRAS in 'mckRAS.pas',
-  KOLRas in 'KOLRas.pas',
-  RAS in 'RAS.pas',
   UStr in 'UStr.pas',
   UWrd in 'UWrd.pas',
   KOLHTTP in 'KOLHTTP.pas',
@@ -81,17 +74,10 @@ contains
   KOLPrinters in 'KOLPrinters.pas',
   mckXPMenus in 'mckXPMenus.pas',
   XPMenus in 'XPMenus.pas',
-  MCKGRushSplitterEditor in 'MCKGRushSplitterEditor.pas',
-  MCKGRushButtonEditor in 'MCKGRushButtonEditor.pas',
-  MCKGRushCheckBoxEditor in 'MCKGRushCheckBoxEditor.pas',
-  MCKGRushControls in 'MCKGRushControls.pas',
-  MCKGRushImageCollectionEditor in 'MCKGRushImageCollectionEditor.pas',
-  MCKGRushPanelEditor in 'MCKGRushPanelEditor.pas',
-  MCKGRushProgressBarEditor in 'MCKGRushProgressBarEditor.pas',
-  MCKGRushRadioBoxEditor in 'MCKGRushRadioBoxEditor.pas',
   tinyPNG in 'tinyPNG.pas',
   tinyJPGGIFBMP in 'tinyJPGGIFBMP.pas',
   MZLib in 'MZLib.pas',
-  KOLGRushControls in 'KOLGRushControls.pas';
+  mckWebBrowser in 'mckWebBrowser.pas',
+  mckDHTML in 'mckDHTML.pas';
 
 end.