From fd6b25b4f0a25c430f42f561eefeaf196a583bd5 Mon Sep 17 00:00:00 2001
From: vincents <vincents@lazarus-ide.org>
Date: Tue, 16 May 2006 07:25:16 +0000
Subject: [PATCH] OldToolbar should not be defined in code. It is not used by
 the LCL.

git-svn-id: trunk@9285 -
---
 lcl/interfaces/wince/winceint.pp        | 4 +---
 lcl/interfaces/wince/wincewscomctrls.pp | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lcl/interfaces/wince/winceint.pp b/lcl/interfaces/wince/winceint.pp
index 4df717c06d..ae85043cb9 100644
--- a/lcl/interfaces/wince/winceint.pp
+++ b/lcl/interfaces/wince/winceint.pp
@@ -32,8 +32,6 @@ interface
 {$ASSERTIONS ON}
 {$ENDIF}
 
-{$DEFINE OldToolbar}
-
 // defining the following will print all messages as they are being handled
 // valuable for investigation of message trees / interrelations
 { $define MSG_DEBUG}
@@ -274,4 +272,4 @@ initialization
 finalization
   Assert(False, 'Trace:WinCEint.pp - Finalization');
 
-end.
\ No newline at end of file
+end.
diff --git a/lcl/interfaces/wince/wincewscomctrls.pp b/lcl/interfaces/wince/wincewscomctrls.pp
index 937dcd68b7..482d1212e0 100644
--- a/lcl/interfaces/wince/wincewscomctrls.pp
+++ b/lcl/interfaces/wince/wincewscomctrls.pp
@@ -23,7 +23,6 @@ unit WinCEWSComCtrls;
 
 {$mode objfpc}{$H+}
 interface
-{$define OldToolbar}
 
 uses
   // FCL
@@ -186,12 +185,13 @@ type
   private
   protected
   public
+{$ifdef OldToolbar}
     class function  CreateHandle(const AWinControl: TWinControl;
           const AParams: TCreateParams): HWND; override;
     class function  GetButtonCount(const AToolBar: TToolBar): integer; override;
     class procedure InsertToolButton(const AToolBar: TToolbar; const AControl: TControl); override;
     class procedure DeleteToolButton(const AToolBar: TToolbar; const AControl: TControl); override;
-
+{$endif}
   end;
 
   { TWinCEWSTrackBar }
@@ -602,9 +602,9 @@ initialization
 //  RegisterWSComponent(TCustomUpDown, TWinCEWSCustomUpDown);
 //  RegisterWSComponent(TCustomUpDown, TWinCEWSUpDown);
 //  RegisterWSComponent(TCustomToolButton, TWinCEWSToolButton);
-//{$ifdef OldToolbar}
+{$ifdef OldToolbar}
   RegisterWSComponent(TToolBar, TWinCEWSToolBar);
-//{$endif}
+{$endif}
   RegisterWSComponent(TCustomTrackBar, TWinCEWSTrackBar);
 //  RegisterWSComponent(TCustomTreeView, TWinCEWSCustomTreeView);
 //  RegisterWSComponent(TCustomTreeView, TWinCEWSTreeView);