* ObjType references constants from fvconsts

fv/app.pas

@@ -62,7 +62,7 @@ USES
    Video,
    FVCommon, Memory,                                    { GFV standard units }
    Objects, Drivers, Views, Menus, HistList, Dialogs,
-   MsgBox;
+   msgbox, fvconsts;
 
 {***************************************************************************}
 {                              PUBLIC CONSTANTS                             }
@@ -317,7 +317,7 @@ PROCEDURE RegisterApp;
 {---------------------------------------------------------------------------}
 CONST
   RBackGround: TStreamRec = (
-     ObjType: 30;                                     { Register id = 30 }
+     ObjType: idBackground;                           { Register id = 30 }
      VmtLink: TypeOf(TBackGround);
      Load:    @TBackGround.Load;                      { Object load method }
      Store:   @TBackGround.Store                      { Object store method }
@@ -328,7 +328,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
   RDeskTop: TStreamRec = (
-     ObjType: 31;                                     { Register id = 31 }
+     ObjType: idDesktop;                              { Register id = 31 }
      VmtLink: TypeOf(TDeskTop);
      Load:    @TDeskTop.Load;                         { Object load method }
      Store:   @TDeskTop.Store                         { Object store method }
@@ -1153,7 +1153,10 @@ END;
 END.
 {
  $Log$
- Revision 1.27  2004-12-18 16:18:47  peter
+ Revision 1.28  2004-12-19 20:20:48  hajny
+   * ObjType references constants from fvconsts
+
+ Revision 1.27  2004/12/18 16:18:47  peter
  win32 fixes
 
  Revision 1.26  2004/11/06 22:03:06  peter

fv/asciitab.pas

@@ -102,19 +102,19 @@ const
 {---------------------------------------------------------------------------}
 
   RTable: TStreamRec = (
-     ObjType: 10030;
+     ObjType: idTable;
      VmtLink: Ofs(TypeOf(TTable)^);
      Load:    @TTable.Load;
      Store:   @TTable.Store
   );
   RReport: TStreamRec = (
-     ObjType: 10031;
+     ObjType: idReport;
      VmtLink: Ofs(TypeOf(TReport)^);
      Load:    @TReport.Load;
      Store:   @TReport.Store
   );
   RASCIIChart: TStreamRec = (
-     ObjType: 10032;
+     ObjType: idASCIIChart;
      VmtLink: Ofs(TypeOf(TASCIIChart)^);
      Load:    @TASCIIChart.Load;
      Store:   @TASCIIChart.Store
@@ -323,7 +323,10 @@ end;
 END.
 {
  $Log$
- Revision 1.6  2004-12-19 13:05:56  florian
+ Revision 1.7  2004-12-19 20:20:47  hajny
+   * ObjType references constants from fvconsts
+
+ Revision 1.6  2004/12/19 13:05:56  florian
    * fixed x86_64 compilation
 
  Revision 1.5  2004/11/06 17:08:48  peter

fv/colortxt.pas

@@ -1,3 +1,4 @@
+{ $Id$  }
 unit ColorTxt;
 
 {
@@ -25,7 +26,7 @@ unit ColorTxt;
 interface
 
 uses
-  Objects, Drivers, Views, Dialogs, App;
+  objects, drivers, views, dialogs, app, fvconsts;
 
 type
   PColoredText = ^TColoredText;
@@ -40,7 +41,7 @@ type
 
 const
   RColoredText: TStreamRec = (
-     ObjType: 611;
+     ObjType: idColoredText;
      VmtLink: Ofs(TypeOf(TColoredText)^);
      Load:    @TColoredText.Load;
      Store:   @TColoredText.Store
@@ -124,3 +125,10 @@ end;
 
 
 end.
+{
+ $Log$
+ Revision 1.3  2004-12-19 20:20:48  hajny
+   * ObjType references constants from fvconsts
+
+
+}

fv/dialogs.pas

@@ -839,7 +839,7 @@ PROCEDURE RegisterDialogs;
 {---------------------------------------------------------------------------}
 CONST
    RDialog: TStreamRec = (
-     ObjType: 10;                                     { Register id = 10 }
+     ObjType: idDialog;                               { Register id = 10 }
      VmtLink: TypeOf(TDialog);
      Load:  @TDialog.Load;                            { Object load method }
      Store: @TDialog.Store                            { Object store method }
@@ -850,7 +850,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RInputLine: TStreamRec = (
-     ObjType: 11;                                     { Register id = 11 }
+     ObjType: idInputLine;                            { Register id = 11 }
      VmtLink: TypeOf(TInputLine);
      Load:  @TInputLine.Load;                         { Object load method }
      Store: @TInputLine.Store                         { Object store method }
@@ -861,7 +861,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RButton: TStreamRec = (
-     ObjType: 12;                                     { Register id = 12 }
+     ObjType: idButton;                               { Register id = 12 }
      VmtLink: TypeOf(TButton);
      Load:  @TButton.Load;                            { Object load method }
      Store: @TButton.Store                            { Object store method }
@@ -872,7 +872,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RCluster: TStreamRec = (
-     ObjType: 13;                                     { Register id = 13 }
+     ObjType: idCluster;                              { Register id = 13 }
      VmtLink: TypeOf(TCluster);
      Load:  @TCluster.Load;                           { Object load method }
      Store: @TCluster.Store                           { Objects store method }
@@ -883,7 +883,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RRadioButtons: TStreamRec = (
-     ObjType: 14;                                     { Register id = 14 }
+     ObjType: idRadioButtons;                         { Register id = 14 }
      VmtLink: TypeOf(TRadioButtons);
      Load:  @TRadioButtons.Load;                      { Object load method }
      Store: @TRadioButtons.Store                      { Object store method }
@@ -894,7 +894,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RCheckBoxes: TStreamRec = (
-     ObjType: 15;                                     { Register id = 15 }
+     ObjType: idCheckBoxes;                           { Register id = 15 }
      VmtLink: TypeOf(TCheckBoxes);
      Load:  @TCheckBoxes.Load;                        { Object load method }
      Store: @TCheckBoxes.Store                        { Object store method }
@@ -905,7 +905,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RMultiCheckBoxes: TStreamRec = (
-     ObjType: 27;                                     { Register id = 27 }
+     ObjType: idMultiCheckBoxes;                      { Register id = 27 }
      VmtLink: TypeOf(TMultiCheckBoxes);
      Load:  @TMultiCheckBoxes.Load;                   { Object load method }
      Store: @TMultiCheckBoxes.Store                   { Object store method }
@@ -916,7 +916,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RListBox: TStreamRec = (
-     ObjType: 16;                                     { Register id = 16 }
+     ObjType: idListBox;                              { Register id = 16 }
      VmtLink: TypeOf(TListBox);
      Load:  @TListBox.Load;                           { Object load method }
      Store: @TListBox.Store                           { Object store method }
@@ -927,7 +927,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RStaticText: TStreamRec = (
-     ObjType: 17;                                     { Register id = 17 }
+     ObjType: idStaticText;                           { Register id = 17 }
      VmtLink: TypeOf(TStaticText);
      Load:  @TStaticText.Load;                        { Object load method }
      Store: @TStaticText.Store                        { Object store method }
@@ -938,7 +938,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RLabel: TStreamRec = (
-     ObjType: 18;                                     { Register id = 18 }
+     ObjType: idLabel;                                { Register id = 18 }
      VmtLink: TypeOf(TLabel);
      Load:  @TLabel.Load;                             { Object load method }
      Store: @TLabel.Store                             { Object store method }
@@ -949,7 +949,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RHistory: TStreamRec = (
-     ObjType: 19;                                     { Register id = 19 }
+     ObjType: idHistory;                              { Register id = 19 }
      VmtLink: TypeOf(THistory);
      Load:  @THistory.Load;                           { Object load method }
      Store: @THistory.Store                           { Object store method }
@@ -960,7 +960,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RParamText: TStreamRec = (
-     ObjType: 20;                                     { Register id = 20 }
+     ObjType: idParamText;                            { Register id = 20 }
      VmtLink: TypeOf(TParamText);
      Load:  @TParamText.Load;                         { Object load method }
      Store: @TParamText.Store                         { Object store method }
@@ -4151,7 +4151,10 @@ END;
 END.
 {
  $Log$
- Revision 1.29  2004-12-15 19:14:11  peter
+ Revision 1.30  2004-12-19 20:20:48  hajny
+   * ObjType references constants from fvconsts
+
+ Revision 1.29  2004/12/15 19:14:11  peter
    * goptions removed
    * small patches from antonio talamini
 

fv/fvconsts.pas

@@ -29,8 +29,8 @@ unit FVConsts;
 interface
 
 {
-  The ObjTypes unit declares constants for all object type IDs used in the
-  FreeVision library.  They have been moved here for easier management.  No
+  The FVConsts unit declares constants for all object type IDs used in the
+  FreeVision library. They have been moved here for easier management. No
   values for views declared in TV 2.0 have been changed from so that original
   resource files may still be used.
 }
@@ -51,7 +51,6 @@ const
   idCluster = 13;
   idRadioButtons = 14;
   idCheckBoxes = 15;
-  idMultiCheckBoxes = 27;
   idListBox = 16;
   idStaticText = 17;
   idLabel = 18;
@@ -63,6 +62,7 @@ const
   idBrowseButton = 24;
   idEditListBox = 25;
   idModalInputLine = 26;
+  idMultiCheckBoxes = 27;
   idListDlg = 28;
 
   { App Unit }
@@ -92,6 +92,9 @@ const
   { Resource Unit }
   idMemStringList = 52;
 
+  { Tabs Unit }
+  idTab = 55;
+
   { StdDlg Unit }
   idFileInputLine = 60;
   idFileCollection = 61;
@@ -137,6 +140,10 @@ const
   idColorItemList = 96;
   idColorDialog = 97;
 
+  { TimedDlg Unit }
+  idTimedDialog = 98;
+  idTimedDialogText = 99;
+
   { Statuses Unit }
   idStatus   = 300;
   idStatusDlg = 301;
@@ -152,10 +159,20 @@ const
 
   { FVList Unit }
 
+  { ColorTxt Unit }
+  idColoredText = 611;
+
+  { InpLong Unit }
+  idInputLong = 711;
+
+  { ASCIITab Unit }
+  idTable = 10030;
+  idReport = 10031;
+  idASCIIChart = 10032;
 
 {
- The Commands unit contains all command constants used in the FreeVision
- library.  They have been extracted from their original units and placed here
+ The FVConsts unit contains all command constants used in the FreeVision
+ library. They have been extracted from their original units and placed here
  for easier maintainence and modification to remove conflicts, such as Borland
  created with the cmChangeDir constant in the StdDlg and App units.
 }
@@ -349,7 +366,7 @@ const
 
 
 {
-  The HelpCtx unit declares standard help contexts used in FreeVision.  By
+  The FVConsts unit declares standard help contexts used in FreeVision. By
   placing all help contexts in one unit, duplicate help contexts are more
   easily prevented
 }
@@ -610,7 +627,7 @@ const
 
 
 {
-  The History unit contains all history list constants used in the FreeVision
+  The FVConsts unit contains all history list constants used in the FreeVision
   Library.
 }
 
@@ -626,7 +643,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.6  2004-11-06 17:08:48  peter
+  Revision 1.7  2004-12-19 20:20:48  hajny
+    * ObjType references constants from fvconsts
+
+  Revision 1.6  2004/11/06 17:08:48  peter
     * drawing of tview merged from old fv code
 
 }

fv/inplong.pas

@@ -1,3 +1,4 @@
+{ $Id$  }
 Unit InpLong;
 
 (*--
@@ -76,7 +77,7 @@ Valid returns False.
 {$endif}
 
 Interface
-uses Objects, Drivers, Views, Dialogs, MsgBox;
+uses objects, drivers, views, dialogs, msgbox, fvconsts;
 
 {flags for TInputLong constructor}
 const
@@ -103,16 +104,13 @@ Type
 
 const
   RInputLong : TStreamRec = (
-    ObjType: 711;
+    ObjType: idInputLong;
     VmtLink: Ofs(Typeof(TInputLong)^);
     Load : @TInputLong.Load;
     Store : @TInputLong.Store);
 
 Implementation
 
-uses
-  FVConsts;
-
 {
-----------------TInputLong.Init}
 constructor TInputLong.Init(var R : TRect; AMaxLen : Sw_Integer;
         LowerLim, UpperLim : LongInt; Flgs : Word);
@@ -306,3 +304,10 @@ Valid := Rslt;
 end;
 
 end.
+{
+ $Log$
+ Revision 1.4  2004-12-19 20:20:48  hajny
+   * ObjType references constants from fvconsts
+
+
+}

fv/menus.pas

@@ -70,7 +70,7 @@ USES
      {$ENDIF}
    {$ENDIF}
 
-   Objects, Drivers, Views;                           { GFV standard units }
+   objects, drivers, views, fvconsts;                 { GFV standard units }
 
 {***************************************************************************}
 {                              PUBLIC CONSTANTS                             }
@@ -335,7 +335,7 @@ PROCEDURE RegisterMenus;
 {---------------------------------------------------------------------------}
 CONST
    RMenuBar: TStreamRec = (
-     ObjType: 40;                                     { Register id = 40 }
+     ObjType: idMenuBar;                              { Register id = 40 }
      {$IFDEF BP_VMTLink}                              { BP style VMT link }
      VmtLink: Ofs(TypeOf(TMenuBar)^);
      {$ELSE}                                          { Alt style VMT link }
@@ -350,7 +350,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RMenuBox: TStreamRec = (
-     ObjType: 41;                                     { Register id = 41 }
+     ObjType: idMenuBox;                              { Register id = 41 }
      {$IFDEF BP_VMTLink}                              { BP style VMT link }
      VmtLink: Ofs(TypeOf(TMenuBox)^);
      {$ELSE}                                          { Alt style VMT link }
@@ -1629,7 +1629,10 @@ END;
 END.
 {
  $Log$
- Revision 1.22  2004-11-06 22:03:06  peter
+ Revision 1.23  2004-12-19 20:20:48  hajny
+   * ObjType references constants from fvconsts
+
+ Revision 1.22  2004/11/06 22:03:06  peter
    * fixed mouse
 
  Revision 1.21  2004/11/06 17:08:48  peter

fv/stddlg.pas

@@ -1,3 +1,4 @@
+{ $Id$  }
 {*******************************************************}
 { Free Vision Runtime Library                           }
 { StdDlg Unit                                           }
@@ -2718,3 +2719,11 @@ begin
   DeleteFile := @StdDeleteFile;
 {$endif PPC_BP}
 end.
+
+{
+ $Log$
+ Revision 1.18  2004-12-19 20:20:48  hajny
+   * ObjType references constants from fvconsts
+
+
+}

fv/validate.pas

@@ -74,7 +74,7 @@ UNIT Validate;
 {$V-} { Turn off strict VAR strings }
 {====================================================================}
 
-USES FVCommon, Objects;                                 { GFV standard units }
+USES FVCommon, Objects, fvconsts;                      { GFV standard units }
 
 {***************************************************************************}
 {                              PUBLIC CONSTANTS                             }
@@ -238,7 +238,7 @@ PROCEDURE RegisterValidate;
 {---------------------------------------------------------------------------}
 CONST
    RPXPictureValidator: TStreamRec = (
-     ObjType: 80;                                     { Register id = 80 }
+     ObjType: idPXPictureValidator;                   { Register id = 80 }
      {$IFDEF BP_VMTLink}                              { BP style VMT link }
      VmtLink: Ofs(TypeOf(TPXPictureValidator)^);
      {$ELSE}                                          { Alt style VMT link }
@@ -253,7 +253,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RFilterValidator: TStreamRec = (
-     ObjType: 81;                                     { Register id = 81 }
+     ObjType: idFilterValidator;                      { Register id = 81 }
      {$IFDEF BP_VMTLink}                              { BP style VMT link }
      VmtLink: Ofs(TypeOf(TFilterValidator)^);
      {$ELSE}                                          { Alt style VMT link }
@@ -268,7 +268,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RRangeValidator: TStreamRec = (
-     ObjType: 82;                                     { Register id = 82 }
+     ObjType: idRangeValidator;                       { Register id = 82 }
      {$IFDEF BP_VMTLink}                              { BP style VMT link }
      VmtLink: Ofs(TypeOf(TRangeValidator)^);
      {$ELSE}                                          { Alt style VMT link }
@@ -283,7 +283,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RStringLookupValidator: TStreamRec = (
-     ObjType: 83;                                     { Register id = 83 }
+     ObjType: idStringLookupValidator;                { Register id = 83 }
      {$IFDEF BP_VMTLink}                              { BP style VMT link }
      VmtLink: Ofs(TypeOf(TStringLookupValidator)^);
      {$ELSE}                                          { Alt style VMT link }
@@ -1059,7 +1059,10 @@ END.
 
 {
  $Log$
- Revision 1.9  2004-11-06 17:08:48  peter
+ Revision 1.10  2004-12-19 20:20:48  hajny
+   * ObjType references constants from fvconsts
+
+ Revision 1.9  2004/11/06 17:08:48  peter
    * drawing of tview merged from old fv code
 
 }

fv/views.pas

@@ -55,7 +55,7 @@ USES
      Os2Def, DosCalls, PmWin,
    {$ENDIF}
 
-   Objects, FVCommon, Drivers;                          { GFV standard units }
+   Objects, FVCommon, Drivers, fvconsts;              { GFV standard units }
 
 {***************************************************************************}
 {                              PUBLIC CONSTANTS                             }
@@ -697,7 +697,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RView: TStreamRec = (
-     ObjType: 1;                                      { Register id = 1 }
+     ObjType: idView;                                 { Register id = 1 }
      VmtLink: TypeOf(TView);                          { Alt style VMT link }
      Load:    @TView.Load;                            { Object load method }
      Store:   @TView.Store                            { Object store method }
@@ -708,7 +708,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RFrame: TStreamRec = (
-     ObjType: 2;                                      { Register id = 2 }
+     ObjType: idFrame;                                { Register id = 2 }
      VmtLink: TypeOf(TFrame);                         { Alt style VMT link }
      Load:    @TFrame.Load;                           { Frame load method }
      Store:   @TFrame.Store                           { Frame store method }
@@ -719,7 +719,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RScrollBar: TStreamRec = (
-     ObjType: 3;                                      { Register id = 3 }
+     ObjType: idScrollBar;                            { Register id = 3 }
      VmtLink: TypeOf(TScrollBar);                     { Alt style VMT link }
      Load:    @TScrollBar.Load;                       { Object load method }
      Store:   @TScrollBar.Store                       { Object store method }
@@ -730,7 +730,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RScroller: TStreamRec = (
-     ObjType: 4;                                      { Register id = 4 }
+     ObjType: idScroller;                             { Register id = 4 }
      VmtLink: TypeOf(TScroller);                      { Alt style VMT link }
      Load:    @TScroller.Load;                        { Object load method }
      Store:   @TScroller.Store                        { Object store method }
@@ -741,7 +741,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RListViewer: TStreamRec = (
-     ObjType: 5;                                      { Register id = 5 }
+     ObjType: idListViewer;                           { Register id = 5 }
      VmtLink: TypeOf(TListViewer);                    { Alt style VMT link }
      Load:    @TListViewer.Load;                      { Object load method }
      Store:   @TLIstViewer.Store                      { Object store method }
@@ -752,7 +752,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RGroup: TStreamRec = (
-     ObjType: 6;                                      { Register id = 6 }
+     ObjType: idGroup;                                { Register id = 6 }
      VmtLink: TypeOf(TGroup);                         { Alt style VMT link }
      Load:    @TGroup.Load;                           { Object load method }
      Store:   @TGroup.Store                           { Object store method }
@@ -763,7 +763,7 @@ CONST
 {---------------------------------------------------------------------------}
 CONST
    RWindow: TStreamRec = (
-     ObjType: 7;                                      { Register id = 7 }
+     ObjType: idWindow;                               { Register id = 7 }
      VmtLink: TypeOf(TWindow);                        { Alt style VMT link }
      Load:    @TWindow.Load;                          { Object load method }
      Store:   @TWindow.Store                          { Object store method }
@@ -917,10 +917,10 @@ BEGIN
      ViewPort.X2 := X2;                               { Set X2 port value }
      ViewPort.Y2 := Y2;                               { Set Y2 port value }
      ViewPort.Clip := Clip;                           { Set port clip value }
-{$ifdef DEBUG}
+{ $ifdef DEBUG
      If WriteDebugInfo then
        Writeln(stderr,'New ViewPort(',X1,',',Y1,',',X2,',',Y2,')');
-{$endif DEBUG}
+ $endif DEBUG}
 END;
 
 {***************************************************************************}
@@ -4620,7 +4620,10 @@ END.
 
 {
  $Log$
- Revision 1.51  2004-12-15 19:14:11  peter
+ Revision 1.52  2004-12-19 20:20:48  hajny
+   * ObjType references constants from fvconsts
+
+ Revision 1.51  2004/12/15 19:14:11  peter
    * goptions removed
    * small patches from antonio talamini