From 856316cb9bdcc51fc9ccd9d0dd0276197e69ad69 Mon Sep 17 00:00:00 2001
From: graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf>
Date: Tue, 14 Aug 2007 06:33:07 +0000
Subject: * That's weird. It compiled at home, but not at work. Renamed the
 conflicting classes and all is fine again.

---
 src/gui/fpgui_package.pas | 2 +-
 src/gui/gui_style.pas     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/gui/fpgui_package.pas b/src/gui/fpgui_package.pas
index 1c4ab693..47413b7f 100644
--- a/src/gui/fpgui_package.pas
+++ b/src/gui/fpgui_package.pas
@@ -10,7 +10,7 @@ uses
   gui_button, gui_combobox, gui_dialogs, gui_edit, gui_form, gui_label, 
     gui_listbox, gui_memo, gui_popupwindow, gui_scrollbar, gui_bevel, 
     gui_checkbox, gui_radiobutton, gui_trackbar, gui_tab, gui_basegrid, 
-    gui_listview, gui_customgrid, gui_progressbar, gui_menu; 
+    gui_listview, gui_customgrid, gui_progressbar, gui_menu, gui_style; 
 
 implementation
 
diff --git a/src/gui/gui_style.pas b/src/gui/gui_style.pas
index a66ed4f3..623a5441 100644
--- a/src/gui/gui_style.pas
+++ b/src/gui/gui_style.pas
@@ -60,7 +60,7 @@ type
       );
       
       
-  TfpgStyleOption = (
+  TfpgStyleOptionEnum = (
       soDefault,
       soFocusRect,
       soButton,
@@ -91,9 +91,9 @@ type
   private
     FRect: TfpgRect;
     FState: TfpgState;
-    FStyleOption: TfpgStyleOption;
+    FStyleOption: TfpgStyleOptionEnum;
   public
-    property  StyleOption: TfpgStyleOption read FStyleOption write FStyleOption;
+    property  StyleOption: TfpgStyleOptionEnum read FStyleOption write FStyleOption;
     property  Rect: TfpgRect read FRect write FRect;
     property  State: TfpgState read FState write FState;
   end;
-- 
cgit v1.2.3-70-g09d2