[Smartwin-cvs] SmartWin/tests/WidgetDialog Main.cpp,1.1,1.2

[andrew7 <bd...@us...>]

Update of /cvsroot/smartwin/SmartWin/tests/WidgetDialog
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6242/tests/WidgetDialog

Modified Files:
	Main.cpp 
Log Message:
Unicode _T()

Index: Main.cpp
===================================================================
RCS file: /cvsroot/smartwin/SmartWin/tests/WidgetDialog/Main.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Main.cpp	15 Oct 2006 14:35:29 -0000	1.1
+++ Main.cpp	18 Feb 2007 14:35:20 -0000	1.2
@@ -30,6 +30,7 @@
 #include "SmartWin.h"
 using namespace SmartWin;
 
+#include <iostream>
 //-------------------------------------------------------
 
 /*		HexDialog
@@ -47,7 +48,7 @@
 	: public SmartWin::WidgetFactory< SmartWin::WidgetDialog, HexDialog<ParentClass>, SmartWin::MessageMapPolicyDialogWidget >
 {
 private:
-	WidgetTextBoxPtr itsHexTxt;
+    typename HexDialog<ParentClass>::WidgetTextBox * itsHexTxt;   // or WidgetText * if using MSVC++
 	ParentClass * itsParent;
 
 public:
@@ -57,11 +58,12 @@
 	: Widget( main ),
 	itsParent( main )
 {
-	createDialog( iddDialog );
+    this->createDialog( iddDialog );
 
-	WidgetButtonPtr btnOk = subclassButton( IDOK );
-	WidgetButtonPtr btnCancel = subclassButton( IDCANCEL );
-	itsHexTxt = subclassTextBox( IDC_HEXEDIT );
+	typename HexDialog<ParentClass>::WidgetButton *btnOk = this->subclassButton( IDOK );
+//	WidgetButtonPtr btnOk = subclassButton( IDOK );
+	typename HexDialog<ParentClass>::WidgetButtonPtr btnCancel = this->subclassButton( IDCANCEL );
+	itsHexTxt = this->subclassTextBox( IDC_HEXEDIT );
 	itsHexTxt->setTextLimit(32);
 	itsHexTxt->setFocus();
 	itsHexTxt->setText( label );
@@ -71,13 +73,13 @@
 	btnOk->onClicked( & HexDialog::OkClicked );
 }
 
-void OkClicked( WidgetButtonPtr btn )
+void OkClicked( typename HexDialog<ParentClass>::WidgetButtonPtr btn )
 {
 	itsParent->dataFromDialog( itsHexTxt->getText() );
 }
 
 
-void cancelClicked( WidgetButtonPtr btn )
+void cancelClicked( typename HexDialog<ParentClass>::WidgetButtonPtr btn )
 {
 	itsParent->dataFromDialog( _T( "Cancel" ) );
 }
@@ -132,17 +134,20 @@
 		itsTabSheet->setButtonStyle( false );
 		itsTabSheet->setHotTrack();
 
-		std::stringstream ss;
+
+		SmartUtil::tstringstream ss;
+
 		for ( int i=0; i < 5; i++ ) {
-			ss << "Page " << i;
+			ss << _T("Page ") << i;
 			itsTabSheet->addPage( ss.str(), i );	ss.str( "" );
 
-			ss << "Dialog  " << i;
+			ss << _T("Dialog  ") << i;
 			itsHexDialogs.push_back( new HexDialog<DialogTestClass>( this, ss.str(), IDD_HEXDIALOG ) );
-			ss.str( "" );
+			ss.str( _T("") );
 
 			itsHexDialogs[i]->setVisible( false );
 		}
+
 		itsLastSelectedIndex= 0;
 		itsHexDialogs[itsLastSelectedIndex]->setVisible( true );