NetBSD port

cde/programs/types/Imakefile

@@ -6,8 +6,6 @@ CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
 
 #if defined (SunArchitecture)
 LOCAL_CPP_DEFINES = $(CPP_DEFINES) -D__sun
-#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
-LOCAL_CPP_DEFINES = $(CPP_DEFINES) -DNO_DTINFO
 #else
 LOCAL_CPP_DEFINES = $(CPP_DEFINES)
 #endif

cde/programs/types/dtwm.fp.src

@@ -182,7 +182,6 @@ CONTROL Applications
   HELP_VOLUME		FPanel
 }
 
-#ifdef NO_DTINFO
 CONTROL Help
 {
   TYPE                  icon
@@ -196,21 +195,6 @@ CONTROL Help
   HELP_TOPIC            FPOnItemHelpMgr
   HELP_VOLUME           FPanel
 }
-#else
-CONTROL InfoManager
-{
-  TYPE			icon
-  CONTAINER_NAME	Top
-  CONTAINER_TYPE	BOX
-  POSITION_HINTS	12
-  ICON			Dtinfo
-  LABEL			%|nls-18031-#Information Manager#|
-  PUSH_ACTION		DtLoadInfoLib
-  DROP_ACTION		DtLoadInfoLib
-  HELP_TOPIC		FPOnItemInfoMgr
-  HELP_VOLUME		FPanel
-}
-#endif
 
 CONTROL Trash
 {
@@ -349,28 +333,16 @@ CONTROL PrintManager
   HELP_VOLUME		Printmgr
 }
 
-#ifndef NO_DTINFO
-SUBPANEL InfoManagerSubpanel
-{
-  CONTAINER_NAME	InfoManager
-  TITLE			%|nls-18032-#Information#|
-}
-#else
 SUBPANEL HelpSubpanel
 {
   CONTAINER_NAME        Help
   TITLE                 %|nls-18019-#Help#|
 }
-#endif
 
 CONTROL HelpOverview
 {
   TYPE			icon
-#ifndef NO_DTINFO
-  CONTAINER_NAME	InfoManagerSubpanel
-#else
   CONTAINER_NAME        HelpSubpanel
-#endif
   CONTAINER_TYPE	SUBPANEL
   POSITION_HINTS	1
   ICON			Dthover
@@ -383,11 +355,7 @@ CONTROL HelpOverview
 CONTROL FPHelp
 {
   TYPE			icon
-#ifndef NO_DTINFO
-  CONTAINER_NAME	InfoManagerSubpanel
-#else
   CONTAINER_NAME	HelpSubpanel
-#endif
   CONTAINER_TYPE	SUBPANEL
   POSITION_HINTS	2
   ICON			Fpfphlp
@@ -397,21 +365,6 @@ CONTROL FPHelp
   HELP_VOLUME		FPanel
 }
 
-#ifndef NO_DTINFO
-CONTROL HelpMgr
-{
-  TYPE                  icon
-  CONTAINER_NAME	InfoManagerSubpanel
-  CONTAINER_TYPE	SUBPANEL
-  POSITION_HINTS	3
-  ICON                  Fphelp
-  LABEL                 %|nls-18009-#Help Manager#|
-  PUSH_ACTION           Dthelpview
-  HELP_TOPIC            FPOnItemHelpMgr
-  HELP_VOLUME           FPanel
-}
-#endif
-
 XCOMM 
 XCOMM  OnItem help uses a pseudo push action FPOnItemHelp.  Dtwm is looking for
 XCOMM  an exact match on this push action string.  Do not localize this push 
@@ -421,9 +374,9 @@ XCOMM
 CONTROL OnItem
 {
   TYPE			icon
-  CONTAINER_NAME	InfoManagerSubpanel
+  CONTAINER_NAME	HelpSubpanel
   CONTAINER_TYPE	SUBPANEL
-  POSITION_HINTS	4
+  POSITION_HINTS	3
   ICON			DthonFP
   LABEL			%|nls-18021-#On Item Help#|
   PUSH_ACTION		FPOnItemHelp
@@ -431,6 +384,19 @@ CONTROL OnItem
   HELP_VOLUME		FPanel
 }
 
+CONTROL InfoMgr
+{
+  TYPE                  icon
+  CONTAINER_NAME	HelpSubpanel
+  CONTAINER_TYPE	SUBPANEL
+  POSITION_HINTS	4
+  ICON                  Dtinfo
+  LABEL                 %|nls-18031-#Information Manager#|
+  PUSH_ACTION           DtLoadInfoLib
+  HELP_TOPIC            FPOnItemInfoMgr
+  HELP_VOLUME           FPanel
+}
+
 ANIMATION TrashDrop
 {
    ANIMATION	Fptrsh1		100