Attachment #38515 for bug #60939

View | Details | Raw Unified | Return to bug 60939
Collapse All | Expand All

Lines 7-13 Link Here

(-)x11-toolkits/viewklass/Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= viewklass	9	PORTNAME= viewklass
10	PORTVERSION= 0.6.0	10	PORTVERSION= 0.7.0
11	CATEGORIES= x11-toolkits	11	CATEGORIES= x11-toolkits
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}

Line 1 Link Here

(-)x11-toolkits/viewklass/distinfo (-1 / +1 lines)
1	MD5 (ViewKlass-0.6.0.tar.gz) = 90395d31bda325f312d645c1ffaec48b	1	MD5 (ViewKlass-0.7.0.tar.gz) = c9d8897173cc18bd668949eef6907a56




--- ./Vk/VkAlignmentGroup.h.orig	Wed Jul 23 02:43:07 2003
+++ ./Vk/VkAlignmentGroup.h	Wed Jul 23 02:45:35 2003
@@ -24,6 +24,9 @@
 
 #include <Vk/VkWidgetList.h>
 #include <Vk/VkOptionMenu.h>
+#include <iostream>
+
+using std::ostream;
 
 class VkAlignmentGroup : public VkWidgetList {
 public:




--- ./Vk/VkCallbackList.h.orig	Wed Jul 23 02:06:54 2003
+++ ./Vk/VkCallbackList.h	Wed Jul 23 02:07:15 2003
@@ -44,6 +44,9 @@
 #include <Vk/VkComponent.h>
 #include <Vk/VkCallbackObject.h>
 
+using std::vector;
+using std::string;
+
 struct VkCallbackListEntry {
     enum CallbackType type;
     VkCallbackObject *component;

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkCallbackObject.h (-11 lines)
1	--- ./Vk/VkCallbackObject.h.orig Wed Jul 23 02:07:33 2003
2	+++ ./Vk/VkCallbackObject.h Wed Jul 23 02:07:48 2003
3	@@ -42,6 +42,8 @@
4
5	#include <Vk/VkConfig.h>
6
7	+using std::vector;
8	+
9	class VkCallbackObject;
10
11	typedef void (VkCallbackObject::*VkCallbackMethod)(




--- ./Vk/VkComponentList.h.orig	Wed Jul 23 02:09:51 2003
+++ ./Vk/VkComponentList.h	Wed Jul 23 02:18:22 2003
@@ -41,6 +41,8 @@
 
 #include <Vk/VkConfig.h>
 
+using std::vector;
+
 class VkComponent;
 
 class VkComponentList {
@@ -59,10 +61,10 @@
     VkComponent* operator[](int indx) const { return elements[indx]; }
 
 	void insert(int pos, VkComponent* c)
-		{ elements.insert(&elements[pos], c); }
+		{ elements.insert(elements.begin () + pos, c); }
     
 	void remove(int pos)
-		{ elements.erase(&elements[pos]); }
+		{ elements.erase(elements.begin () + pos); }
     
 private:
     vector<VkComponent*> elements;

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkDialogManager.h (-11 lines)
1	--- ./Vk/VkDialogManager.h.orig Wed Jul 23 02:13:42 2003
2	+++ ./Vk/VkDialogManager.h Wed Jul 23 02:13:57 2003
3	@@ -49,6 +49,8 @@
4	#include <Vk/VkResource.h>
5	#include <Vk/VkSimpleWindow.h>
6
7	+using std::string;
8	+
9	class VkDialogManager : public VkComponent {
10	public:
11	typedef enum {OK, APPLY, CANCEL} VkDialogReason;

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkMenuItem.h (-11 lines)
1	--- ./Vk/VkMenuItem.h.orig Wed Jul 23 02:22:17 2003
2	+++ ./Vk/VkMenuItem.h Wed Jul 23 02:22:29 2003
3	@@ -41,6 +41,8 @@
4	#include <Vk/VkComponent.h>
5	#include <Vk/VkWidgetList.h>
6
7	+using std::string;
8	+
9	typedef enum {ACTION, ACTIONWIDGET, CONFIRMFIRSTACTION, TOGGLE, LABEL,
10	SEPARATOR, SUBMENU, RADIOSUBMENU, BAR, OPTION, POPUP, OBJECT,
11	END} VkMenuItemType;




--- ./Vk/VkNameList.h.orig	Wed Jul 23 02:23:57 2003
+++ ./Vk/VkNameList.h	Wed Jul 23 02:24:28 2003
@@ -43,6 +43,9 @@
 #include <Xm/Xm.h>
 #include <Vk/VkConfig.h>
 
+using std::vector;
+using std::string;
+
 class VkNameList {
  public:
     VkNameList();

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkPrefItem.h (-11 lines)
1	--- ./Vk/VkPrefItem.h.orig Wed Jul 23 02:40:46 2003
2	+++ ./Vk/VkPrefItem.h Wed Jul 23 02:41:01 2003
3	@@ -45,6 +45,8 @@
4
5	#include <string>
6
7	+using std::string;
8	+
9	class VkPrefItem : public VkComponent {
10	public:
11	enum VkPrefItemType {PI_group, PI_list, PI_radio, PI_text, PI_toggle,

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-VkAlignmentGroup.C (-11 lines)
1	--- ./VkAlignmentGroup.C.orig Wed Jul 23 02:44:15 2003
2	+++ ./VkAlignmentGroup.C Wed Jul 23 02:45:22 2003
3	@@ -36,6 +36,8 @@
4
5	#include <Vk/VkAlignmentGroup.h>
6
7	+using std::endl;
8	+
9	VkAlignmentGroup::VkAlignmentGroup()
10	: VkWidgetList(),
11	_maxWidth(0),




--- ./VkCallbackObject.C.orig	Wed Jul 23 02:08:26 2003
+++ ./VkCallbackObject.C	Wed Jul 23 02:09:04 2003
@@ -45,6 +45,9 @@
 #include <Vk/VkCallbackObject.h>
 #include <Vk/VkCallbackList.h>
 
+using std::cerr;
+using std::endl;
+
 VkCallbackObject::VkCallbackObject()
 {
 }




--- ./VkComponent.C.orig	Wed Jul 23 02:12:18 2003
+++ ./VkComponent.C	Wed Jul 23 02:13:09 2003
@@ -46,6 +46,10 @@
 #include <Vk/VkComponent.h>
 #include <Vk/VkApp.h>
 
+using std::string;
+using std::cerr;
+using std::endl;
+
 const char *const VkComponent::deleteCallback = "VkComponentDeleteCallback";
 
 VkComponent::VkComponent(const char *name)

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-VkNameList.C (-11 lines)
1	--- ./VkNameList.C.orig Wed Jul 23 02:39:09 2003
2	+++ ./VkNameList.C Wed Jul 23 02:39:23 2003
3	@@ -105,7 +105,7 @@
4	}
5
6	void
7	-VkNameList::remove(int index, int count=1)
8	+VkNameList::remove(int index, int count)
9	{
10	_contents.erase(_contents.begin() + index,
11	_contents.begin() + index + count);

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-VkPipe.C (-11 lines)
1	--- ./VkPipe.C.orig Wed Jul 23 02:33:13 2003
2	+++ ./VkPipe.C Wed Jul 23 03:05:28 2003
3	@@ -67,7 +67,7 @@
4	_input->attach(pipefd[0], XtInputReadMask);
5	_input->addCallback(VkInput::inputCallback,
6	this,
7	- (VkCallbackMethod)&(VkPipe::handleInput));
8	+ (VkCallbackMethod)(&VkPipe::handleInput));
9	}
10
11	VkPipe::~VkPipe()




--- ./VkPrefRadio.C.orig	Wed Jul 23 02:42:07 2003
+++ ./VkPrefRadio.C	Wed Jul 23 02:42:38 2003
@@ -40,6 +40,10 @@
 #include <Xm/Form.h>
 
 #include <Vk/VkPrefRadio.h>
+#include <iostream>
+
+using std::cerr;
+using std::endl;
 
 // A VkPrefRadio is a vertical VkPrefGroup with no label
 VkPrefRadio::VkPrefRadio(const char *name,




--- ./VkRadioGroup.C.orig	Wed Jul 23 02:25:08 2003
+++ ./VkRadioGroup.C	Wed Jul 23 02:31:58 2003
@@ -47,11 +47,15 @@
 #include <Xm/ToggleBG.h>
 #include <Xm/PushB.h>
 #include <Xm/PushBG.h>
+#include <iostream>
+
+using std::cerr;
+using std::endl;
 
 VkRadioGroup::VkRadioGroup()
 	: VkWidgetList()
 {
-    _currentlySelected = 0;
+    //_currentlySelected = 0;
 }
 
 void 
@@ -77,9 +81,9 @@
 void 
 VkRadioGroup::remove(Widget item)
 {
-    if (*_currentlySelected == item)
+    /*if (*_currentlySelected == item)
         _currentlySelected = 0;
-    else if (_currentlySelected > VkWidgetList::find(item))
+    else */ if (_currentlySelected > VkWidgetList::find(item))
         _currentlySelected --;
 
 	XtRemoveCallback(item, XmNvalueChangedCallback,




--- ./VkSimpleWindow.C.orig	Wed Jul 23 02:18:56 2003
+++ ./VkSimpleWindow.C	Wed Jul 23 02:20:37 2003
@@ -44,6 +44,10 @@
 #include <X11/Xutil.h>
 #include <X11/Xmu/Editres.h>
 
+using std::cerr;
+using std::endl;
+using std::exception;
+
 static char* rcsid
 #ifdef __GNUC__
 __attribute__ ((unused))




--- ./VkSubProcess.C.orig	Wed Jul 23 02:39:49 2003
+++ ./VkSubProcess.C	Wed Jul 23 02:40:21 2003
@@ -40,6 +40,10 @@
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h> // for exec*
+#include <iostream>
+
+using std::cerr;
+using std::endl;
 
 VkSubProcess::VkSubProcess(char *prog,
 						   VkNameList *given,




--- VkTrace.C.orig	Thu Jul 11 08:46:58 2002
+++ VkTrace.C	Wed Jul 23 03:22:53 2003
@@ -28,8 +28,13 @@
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
+#include <stdarg.h>
 
 #include <Vk/VkTrace.h>
+#include <fstream>
+
+using std::ofstream;
+using std::endl;
 
 ofstream* vkTraceOut = 0;
 




--- ./VkWindow.C.orig	Wed Jul 23 02:21:06 2003
+++ ./VkWindow.C	Wed Jul 23 02:21:39 2003
@@ -42,6 +42,10 @@
 #include <Vk/VkWindow.h>
 #include <iostream.h>
 
+using std::cerr;
+using std::endl;
+using std::exception;
+
 VkWindow::VkWindow(const char* name,
 				   ArgList args,
 				   Cardinal argCount)




include/Vk/VkMenuSeparator.h
include/Vk/VkMenuToggle.h
include/Vk/VkMenuUndoManager.h
include/Vk/VkMessageDialog.h
include/Vk/VkModel.h
include/Vk/VkNameList.h
include/Vk/VkOptionMenu.h
include/Vk/VkPeriodic.h
include/Vk/VkPipe.h
include/Vk/VkPixmap.h
include/Vk/VkPopupMenu.h
include/Vk/VkPrefCustom.h
include/Vk/VkPrefDialog.h

Lines 7-13 Link Here

(-)x11-toolkits/viewklass/Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= viewklass	9	PORTNAME= viewklass
10	PORTVERSION= 0.6.0	10	PORTVERSION= 0.7.0
11	CATEGORIES= x11-toolkits	11	CATEGORIES= x11-toolkits
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}

Line 1 Link Here

(-)x11-toolkits/viewklass/distinfo (-1 / +1 lines)
1	MD5 (ViewKlass-0.6.0.tar.gz) = 90395d31bda325f312d645c1ffaec48b	1	MD5 (ViewKlass-0.7.0.tar.gz) = c9d8897173cc18bd668949eef6907a56




--- ./Vk/VkAlignmentGroup.h.orig	Wed Jul 23 02:43:07 2003
+++ ./Vk/VkAlignmentGroup.h	Wed Jul 23 02:45:35 2003
@@ -24,6 +24,9 @@
 
 #include <Vk/VkWidgetList.h>
 #include <Vk/VkOptionMenu.h>
+#include <iostream>
+
+using std::ostream;
 
 class VkAlignmentGroup : public VkWidgetList {
 public:




--- ./Vk/VkCallbackList.h.orig	Wed Jul 23 02:06:54 2003
+++ ./Vk/VkCallbackList.h	Wed Jul 23 02:07:15 2003
@@ -44,6 +44,9 @@
 #include <Vk/VkComponent.h>
 #include <Vk/VkCallbackObject.h>
 
+using std::vector;
+using std::string;
+
 struct VkCallbackListEntry {
     enum CallbackType type;
     VkCallbackObject *component;

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkCallbackObject.h (-11 lines)
1	--- ./Vk/VkCallbackObject.h.orig Wed Jul 23 02:07:33 2003
2	+++ ./Vk/VkCallbackObject.h Wed Jul 23 02:07:48 2003
3	@@ -42,6 +42,8 @@
4
5	#include <Vk/VkConfig.h>
6
7	+using std::vector;
8	+
9	class VkCallbackObject;
10
11	typedef void (VkCallbackObject::*VkCallbackMethod)(




--- ./Vk/VkComponentList.h.orig	Wed Jul 23 02:09:51 2003
+++ ./Vk/VkComponentList.h	Wed Jul 23 02:18:22 2003
@@ -41,6 +41,8 @@
 
 #include <Vk/VkConfig.h>
 
+using std::vector;
+
 class VkComponent;
 
 class VkComponentList {
@@ -59,10 +61,10 @@
     VkComponent* operator[](int indx) const { return elements[indx]; }
 
 	void insert(int pos, VkComponent* c)
-		{ elements.insert(&elements[pos], c); }
+		{ elements.insert(elements.begin () + pos, c); }
     
 	void remove(int pos)
-		{ elements.erase(&elements[pos]); }
+		{ elements.erase(elements.begin () + pos); }
     
 private:
     vector<VkComponent*> elements;

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkDialogManager.h (-11 lines)
1	--- ./Vk/VkDialogManager.h.orig Wed Jul 23 02:13:42 2003
2	+++ ./Vk/VkDialogManager.h Wed Jul 23 02:13:57 2003
3	@@ -49,6 +49,8 @@
4	#include <Vk/VkResource.h>
5	#include <Vk/VkSimpleWindow.h>
6
7	+using std::string;
8	+
9	class VkDialogManager : public VkComponent {
10	public:
11	typedef enum {OK, APPLY, CANCEL} VkDialogReason;

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkMenuItem.h (-11 lines)
1	--- ./Vk/VkMenuItem.h.orig Wed Jul 23 02:22:17 2003
2	+++ ./Vk/VkMenuItem.h Wed Jul 23 02:22:29 2003
3	@@ -41,6 +41,8 @@
4	#include <Vk/VkComponent.h>
5	#include <Vk/VkWidgetList.h>
6
7	+using std::string;
8	+
9	typedef enum {ACTION, ACTIONWIDGET, CONFIRMFIRSTACTION, TOGGLE, LABEL,
10	SEPARATOR, SUBMENU, RADIOSUBMENU, BAR, OPTION, POPUP, OBJECT,
11	END} VkMenuItemType;




--- ./Vk/VkNameList.h.orig	Wed Jul 23 02:23:57 2003
+++ ./Vk/VkNameList.h	Wed Jul 23 02:24:28 2003
@@ -43,6 +43,9 @@
 #include <Xm/Xm.h>
 #include <Vk/VkConfig.h>
 
+using std::vector;
+using std::string;
+
 class VkNameList {
  public:
     VkNameList();

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkPrefItem.h (-11 lines)
1	--- ./Vk/VkPrefItem.h.orig Wed Jul 23 02:40:46 2003
2	+++ ./Vk/VkPrefItem.h Wed Jul 23 02:41:01 2003
3	@@ -45,6 +45,8 @@
4
5	#include <string>
6
7	+using std::string;
8	+
9	class VkPrefItem : public VkComponent {
10	public:
11	enum VkPrefItemType {PI_group, PI_list, PI_radio, PI_text, PI_toggle,

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-VkAlignmentGroup.C (-11 lines)
1	--- ./VkAlignmentGroup.C.orig Wed Jul 23 02:44:15 2003
2	+++ ./VkAlignmentGroup.C Wed Jul 23 02:45:22 2003
3	@@ -36,6 +36,8 @@
4
5	#include <Vk/VkAlignmentGroup.h>
6
7	+using std::endl;
8	+
9	VkAlignmentGroup::VkAlignmentGroup()
10	: VkWidgetList(),
11	_maxWidth(0),




--- ./VkCallbackObject.C.orig	Wed Jul 23 02:08:26 2003
+++ ./VkCallbackObject.C	Wed Jul 23 02:09:04 2003
@@ -45,6 +45,9 @@
 #include <Vk/VkCallbackObject.h>
 #include <Vk/VkCallbackList.h>
 
+using std::cerr;
+using std::endl;
+
 VkCallbackObject::VkCallbackObject()
 {
 }




--- ./VkComponent.C.orig	Wed Jul 23 02:12:18 2003
+++ ./VkComponent.C	Wed Jul 23 02:13:09 2003
@@ -46,6 +46,10 @@
 #include <Vk/VkComponent.h>
 #include <Vk/VkApp.h>
 
+using std::string;
+using std::cerr;
+using std::endl;
+
 const char *const VkComponent::deleteCallback = "VkComponentDeleteCallback";
 
 VkComponent::VkComponent(const char *name)

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-VkNameList.C (-11 lines)
1	--- ./VkNameList.C.orig Wed Jul 23 02:39:09 2003
2	+++ ./VkNameList.C Wed Jul 23 02:39:23 2003
3	@@ -105,7 +105,7 @@
4	}
5
6	void
7	-VkNameList::remove(int index, int count=1)
8	+VkNameList::remove(int index, int count)
9	{
10	_contents.erase(_contents.begin() + index,
11	_contents.begin() + index + count);

Lines 1-11 Link Here

(-)x11-toolkits/viewklass/files/patch-VkPipe.C (-11 lines)
1	--- ./VkPipe.C.orig Wed Jul 23 02:33:13 2003
2	+++ ./VkPipe.C Wed Jul 23 03:05:28 2003
3	@@ -67,7 +67,7 @@
4	_input->attach(pipefd[0], XtInputReadMask);
5	_input->addCallback(VkInput::inputCallback,
6	this,
7	- (VkCallbackMethod)&(VkPipe::handleInput));
8	+ (VkCallbackMethod)(&VkPipe::handleInput));
9	}
10
11	VkPipe::~VkPipe()




--- ./VkPrefRadio.C.orig	Wed Jul 23 02:42:07 2003
+++ ./VkPrefRadio.C	Wed Jul 23 02:42:38 2003
@@ -40,6 +40,10 @@
 #include <Xm/Form.h>
 
 #include <Vk/VkPrefRadio.h>
+#include <iostream>
+
+using std::cerr;
+using std::endl;
 
 // A VkPrefRadio is a vertical VkPrefGroup with no label
 VkPrefRadio::VkPrefRadio(const char *name,




--- ./VkRadioGroup.C.orig	Wed Jul 23 02:25:08 2003
+++ ./VkRadioGroup.C	Wed Jul 23 02:31:58 2003
@@ -47,11 +47,15 @@
 #include <Xm/ToggleBG.h>
 #include <Xm/PushB.h>
 #include <Xm/PushBG.h>
+#include <iostream>
+
+using std::cerr;
+using std::endl;
 
 VkRadioGroup::VkRadioGroup()
 	: VkWidgetList()
 {
-    _currentlySelected = 0;
+    //_currentlySelected = 0;
 }
 
 void 
@@ -77,9 +81,9 @@
 void 
 VkRadioGroup::remove(Widget item)
 {
-    if (*_currentlySelected == item)
+    /*if (*_currentlySelected == item)
         _currentlySelected = 0;
-    else if (_currentlySelected > VkWidgetList::find(item))
+    else */ if (_currentlySelected > VkWidgetList::find(item))
         _currentlySelected --;
 
 	XtRemoveCallback(item, XmNvalueChangedCallback,




--- ./VkSimpleWindow.C.orig	Wed Jul 23 02:18:56 2003
+++ ./VkSimpleWindow.C	Wed Jul 23 02:20:37 2003
@@ -44,6 +44,10 @@
 #include <X11/Xutil.h>
 #include <X11/Xmu/Editres.h>
 
+using std::cerr;
+using std::endl;
+using std::exception;
+
 static char* rcsid
 #ifdef __GNUC__
 __attribute__ ((unused))




--- ./VkSubProcess.C.orig	Wed Jul 23 02:39:49 2003
+++ ./VkSubProcess.C	Wed Jul 23 02:40:21 2003
@@ -40,6 +40,10 @@
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h> // for exec*
+#include <iostream>
+
+using std::cerr;
+using std::endl;
 
 VkSubProcess::VkSubProcess(char *prog,
 						   VkNameList *given,




--- VkTrace.C.orig	Thu Jul 11 08:46:58 2002
+++ VkTrace.C	Wed Jul 23 03:22:53 2003
@@ -28,8 +28,13 @@
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
+#include <stdarg.h>
 
 #include <Vk/VkTrace.h>
+#include <fstream>
+
+using std::ofstream;
+using std::endl;
 
 ofstream* vkTraceOut = 0;
 




--- ./VkWindow.C.orig	Wed Jul 23 02:21:06 2003
+++ ./VkWindow.C	Wed Jul 23 02:21:39 2003
@@ -42,6 +42,10 @@
 #include <Vk/VkWindow.h>
 #include <iostream.h>
 
+using std::cerr;
+using std::endl;
+using std::exception;
+
 VkWindow::VkWindow(const char* name,
 				   ArgList args,
 				   Cardinal argCount)




include/Vk/VkMenuSeparator.h
include/Vk/VkMenuToggle.h
include/Vk/VkMenuUndoManager.h
include/Vk/VkMessageDialog.h
include/Vk/VkModel.h
include/Vk/VkNameList.h
include/Vk/VkOptionMenu.h
include/Vk/VkPeriodic.h
include/Vk/VkPipe.h
include/Vk/VkPixmap.h
include/Vk/VkPopupMenu.h
include/Vk/VkPrefCustom.h
include/Vk/VkPrefDialog.h

Return to bug 60939

Lines 1-12 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkAlignmentGroup.h (-12 lines)
1	--- ./Vk/VkAlignmentGroup.h.orig Wed Jul 23 02:43:07 2003
2	+++ ./Vk/VkAlignmentGroup.h Wed Jul 23 02:45:35 2003
3	@@ -24,6 +24,9 @@
4
5	#include <Vk/VkWidgetList.h>
6	#include <Vk/VkOptionMenu.h>
7	+#include <iostream>
8	+
9	+using std::ostream;
10
11	class VkAlignmentGroup : public VkWidgetList {
12	public:

Lines 1-12 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkCallbackList.h (-12 lines)
1	--- ./Vk/VkCallbackList.h.orig Wed Jul 23 02:06:54 2003
2	+++ ./Vk/VkCallbackList.h Wed Jul 23 02:07:15 2003
3	@@ -44,6 +44,9 @@
4	#include <Vk/VkComponent.h>
5	#include <Vk/VkCallbackObject.h>
6
7	+using std::vector;
8	+using std::string;
9	+
10	struct VkCallbackListEntry {
11	enum CallbackType type;
12	VkCallbackObject *component;

Lines 1-24 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkComponentList.h (-24 lines)
1	--- ./Vk/VkComponentList.h.orig Wed Jul 23 02:09:51 2003
2	+++ ./Vk/VkComponentList.h Wed Jul 23 02:18:22 2003
3	@@ -41,6 +41,8 @@
4
5	#include <Vk/VkConfig.h>
6
7	+using std::vector;
8	+
9	class VkComponent;
10
11	class VkComponentList {
12	@@ -59,10 +61,10 @@
13	VkComponent* operator[](int indx) const { return elements[indx]; }
14
15	void insert(int pos, VkComponent* c)
16	- { elements.insert(&elements[pos], c); }
17	+ { elements.insert(elements.begin () + pos, c); }
18
19	void remove(int pos)
20	- { elements.erase(&elements[pos]); }
21	+ { elements.erase(elements.begin () + pos); }
22
23	private:
24	vector<VkComponent*> elements;

Lines 1-12 Link Here

(-)x11-toolkits/viewklass/files/patch-Vk::VkNameList.h (-12 lines)
1	--- ./Vk/VkNameList.h.orig Wed Jul 23 02:23:57 2003
2	+++ ./Vk/VkNameList.h Wed Jul 23 02:24:28 2003
3	@@ -43,6 +43,9 @@
4	#include <Xm/Xm.h>
5	#include <Vk/VkConfig.h>
6
7	+using std::vector;
8	+using std::string;
9	+
10	class VkNameList {
11	public:
12	VkNameList();

Lines 1-12 Link Here

(-)x11-toolkits/viewklass/files/patch-VkCallbackObject.C (-12 lines)
1	--- ./VkCallbackObject.C.orig Wed Jul 23 02:08:26 2003
2	+++ ./VkCallbackObject.C Wed Jul 23 02:09:04 2003
3	@@ -45,6 +45,9 @@
4	#include <Vk/VkCallbackObject.h>
5	#include <Vk/VkCallbackList.h>
6
7	+using std::cerr;
8	+using std::endl;
9	+
10	VkCallbackObject::VkCallbackObject()
11	{
12	}

Lines 1-13 Link Here

(-)x11-toolkits/viewklass/files/patch-VkComponent.C (-13 lines)
1	--- ./VkComponent.C.orig Wed Jul 23 02:12:18 2003
2	+++ ./VkComponent.C Wed Jul 23 02:13:09 2003
3	@@ -46,6 +46,10 @@
4	#include <Vk/VkComponent.h>
5	#include <Vk/VkApp.h>
6
7	+using std::string;
8	+using std::cerr;
9	+using std::endl;
10	+
11	const char *const VkComponent::deleteCallback = "VkComponentDeleteCallback";
12
13	VkComponent::VkComponent(const char *name)

Lines 1-13 Link Here

(-)x11-toolkits/viewklass/files/patch-VkPrefRadio.C (-13 lines)
1	--- ./VkPrefRadio.C.orig Wed Jul 23 02:42:07 2003
2	+++ ./VkPrefRadio.C Wed Jul 23 02:42:38 2003
3	@@ -40,6 +40,10 @@
4	#include <Xm/Form.h>
5
6	#include <Vk/VkPrefRadio.h>
7	+#include <iostream>
8	+
9	+using std::cerr;
10	+using std::endl;
11
12	// A VkPrefRadio is a vertical VkPrefGroup with no label
13	VkPrefRadio::VkPrefRadio(const char *name,

Lines 1-31 Link Here

(-)x11-toolkits/viewklass/files/patch-VkRadioGroup.C (-31 lines)
1	--- ./VkRadioGroup.C.orig Wed Jul 23 02:25:08 2003
2	+++ ./VkRadioGroup.C Wed Jul 23 02:31:58 2003
3	@@ -47,11 +47,15 @@
4	#include <Xm/ToggleBG.h>
5	#include <Xm/PushB.h>
6	#include <Xm/PushBG.h>
7	+#include <iostream>
8	+
9	+using std::cerr;
10	+using std::endl;
11
12	VkRadioGroup::VkRadioGroup()
13	: VkWidgetList()
14	{
15	- _currentlySelected = 0;
16	+ //_currentlySelected = 0;
17	}
18
19	void
20	@@ -77,9 +81,9 @@
21	void
22	VkRadioGroup::remove(Widget item)
23	{
24	- if (*_currentlySelected == item)
25	+ /if (_currentlySelected == item)
26	_currentlySelected = 0;
27	- else if (_currentlySelected > VkWidgetList::find(item))
28	+ else */ if (_currentlySelected > VkWidgetList::find(item))
29	_currentlySelected --;
30
31	XtRemoveCallback(item, XmNvalueChangedCallback,

Lines 1-13 Link Here

(-)x11-toolkits/viewklass/files/patch-VkSimpleWindow.C (-13 lines)
1	--- ./VkSimpleWindow.C.orig Wed Jul 23 02:18:56 2003
2	+++ ./VkSimpleWindow.C Wed Jul 23 02:20:37 2003
3	@@ -44,6 +44,10 @@
4	#include <X11/Xutil.h>
5	#include <X11/Xmu/Editres.h>
6
7	+using std::cerr;
8	+using std::endl;
9	+using std::exception;
10	+
11	static char* rcsid
12	#ifdef __GNUC__
13	__attribute__ ((unused))

Lines 1-13 Link Here

(-)x11-toolkits/viewklass/files/patch-VkSubProcess.C (-13 lines)
1	--- ./VkSubProcess.C.orig Wed Jul 23 02:39:49 2003
2	+++ ./VkSubProcess.C Wed Jul 23 02:40:21 2003
3	@@ -40,6 +40,10 @@
4	#include <signal.h>
5	#include <stdio.h>
6	#include <unistd.h> // for exec*
7	+#include <iostream>
8	+
9	+using std::cerr;
10	+using std::endl;
11
12	VkSubProcess::VkSubProcess(char *prog,
13	VkNameList *given,

Lines 1-16 Link Here

(-)x11-toolkits/viewklass/files/patch-VkTrace.C (-16 lines)
1	--- VkTrace.C.orig Thu Jul 11 08:46:58 2002
2	+++ VkTrace.C Wed Jul 23 03:22:53 2003
3	@@ -28,8 +28,13 @@
4	#include <stdio.h>
5	#include <time.h>
6	#include <string.h>
7	+#include <stdarg.h>
8
9	#include <Vk/VkTrace.h>
10	+#include <fstream>
11	+
12	+using std::ofstream;
13	+using std::endl;
14
15	ofstream* vkTraceOut = 0;
16

Lines 1-13 Link Here

(-)x11-toolkits/viewklass/files/patch-VkWindow.C (-13 lines)
1	--- ./VkWindow.C.orig Wed Jul 23 02:21:06 2003
2	+++ ./VkWindow.C Wed Jul 23 02:21:39 2003
3	@@ -42,6 +42,10 @@
4	#include <Vk/VkWindow.h>
5	#include <iostream.h>
6
7	+using std::cerr;
8	+using std::endl;
9	+using std::exception;
10	+
11	VkWindow::VkWindow(const char* name,
12	ArgList args,
13	Cardinal argCount)

Lines 34-44 Link Here

(-)x11-toolkits/viewklass/pkg-plist (+2 lines)
34	include/Vk/VkMenuSeparator.h	34	include/Vk/VkMenuSeparator.h
35	include/Vk/VkMenuToggle.h	35	include/Vk/VkMenuToggle.h
36	include/Vk/VkMenuUndoManager.h	36	include/Vk/VkMenuUndoManager.h
		37	include/Vk/VkMessageDialog.h
37	include/Vk/VkModel.h	38	include/Vk/VkModel.h
38	include/Vk/VkNameList.h	39	include/Vk/VkNameList.h
39	include/Vk/VkOptionMenu.h	40	include/Vk/VkOptionMenu.h
40	include/Vk/VkPeriodic.h	41	include/Vk/VkPeriodic.h
41	include/Vk/VkPipe.h	42	include/Vk/VkPipe.h
		43	include/Vk/VkPixmap.h
42	include/Vk/VkPopupMenu.h	44	include/Vk/VkPopupMenu.h
43	include/Vk/VkPrefCustom.h	45	include/Vk/VkPrefCustom.h
44	include/Vk/VkPrefDialog.h	46	include/Vk/VkPrefDialog.h