diff options
| author | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-03-26 08:22:17 +0000 |
|---|---|---|
| committer | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-03-26 08:22:17 +0000 |
| commit | 65249d0bb04c15a543060f782b2c669ea5210cfd (patch) | |
| tree | c8f0d6b55b64c4f5eacf4c23d6c9f2c0f82f247f | |
| parent | 2d038b8826cc04b9616f1666797b3550b4ebe489 (diff) | |
| download | fpGUI-65249d0bb04c15a543060f782b2c669ea5210cfd.tar.xz | |
* Now we are correctly handling the ComponentState property between different versions of FPC. This also fixed the UI Designer strange issues.
| -rw-r--r-- | src/corelib/gfx_widget.pas | 13 | ||||
| -rw-r--r-- | src/corelib/gfxbase.pas | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/corelib/gfx_widget.pas b/src/corelib/gfx_widget.pas index 48884c3b..09faaaf0 100644 --- a/src/corelib/gfx_widget.pas +++ b/src/corelib/gfx_widget.pas @@ -228,14 +228,11 @@ end; constructor TfpgWidget.Create(AOwner: TComponent); begin - { TODO: -oGraeme -cRelease_Blocker ComponentState is read-only. I'm - exploiting a FPC <= 2.2.0 bug. I need to fix this! } -// {$if defined(VER2_0) or defined(VER2_2_0)} -// Include(ComponentState, csLoading); -// {$else} -// Loading; // ???? -// {$endif} - Include(FComponentState, csLoading); + {$if defined(VER2_0) or defined(VER2_2_0)} + Include(ComponentState, csLoading); + {$else} + Loading; + {$endif} FOnScreen := False; FVisible := True; diff --git a/src/corelib/gfxbase.pas b/src/corelib/gfxbase.pas index b198611c..03724322 100644 --- a/src/corelib/gfxbase.pas +++ b/src/corelib/gfxbase.pas @@ -313,8 +313,6 @@ type TfpgComponent = class(TComponent) private FTagPointer: Pointer; - protected - FComponentState: TComponentState; // because FPC developers don't want to give me a TComponent.Loading function public property TagPointer: Pointer read FTagPointer write FTagPointer; end; |