diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc
index bf7538e3bc..13a66a43b8 100644
--- a/lcl/interfaces/win32/win32object.inc
+++ b/lcl/interfaces/win32/win32object.inc
@@ -897,7 +897,7 @@ activate_time :	the time at which the activation event occurred.
             If (TControl(Sender).fCompStyle = csListBox)
             Or (TControl(Sender).FCompStyle = csCListBox) Then
             Begin
-              If TListBox(Sender).BorderStyle = TBorderStyle(bsSingle) Then
+              If TCustomListBox(Sender).BorderStyle = TBorderStyle(bsSingle) Then
                 SetWindowLong(Handle, GWL_EXSTYLE, GetWindowLong(Handle, GWL_EXSTYLE) Or WS_EX_CLIENTEDGE)
               Else
                 SetWindowLong(Handle, GWL_EXSTYLE, GetWindowLong(Handle, GWL_EXSTYLE) And Not WS_EX_CLIENTEDGE);
@@ -2617,6 +2617,9 @@ End;
 
 {
   $Log$
+  Revision 1.38  2002/12/28 21:44:51  mattias
+  further cleanup
+
   Revision 1.37  2002/12/28 21:38:50  mattias
   cleanups
 
diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp
index 380e627fec..19f8488473 100644
--- a/lcl/stdctrls.pp
+++ b/lcl/stdctrls.pp
@@ -364,7 +364,6 @@ type
     procedure DrawItem(Index: Integer; ARect: TRect;
       State: TOwnerDrawState); virtual;
   protected
-    property BorderStyle : TBorderStyle read FBorderStyle write SetBorderStyle;
     property ExtendedSelect : boolean read FExtendedSelect write SetExtendedSelect;
     property Sorted : boolean read FSorted write SetSorted;
     property Style : TListBoxStyle read FStyle write SetStyle;
@@ -374,6 +373,7 @@ type
     constructor Create(AOwner : TComponent); override;
     destructor Destroy; override;
     procedure Clear;
+    property BorderStyle : TBorderStyle read FBorderStyle write SetBorderStyle;
     property Canvas: TCanvas read FCanvas;
     property ItemIndex : integer read GetItemIndex write SetItemIndex;
     property Items : TStrings read FItems write SetItems;
@@ -1392,6 +1392,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.73  2002/12/28 21:44:51  mattias
+  further cleanup
+
   Revision 1.72  2002/12/27 10:34:55  mattias
   message view scrolls to message