Menu
▾
▴
[Oorexx-svn] SF.net SVN: oorexx:[8125] ooDialog
|
From: <mie...@us...> - 2012-07-29 23:30:49
|
Revision: 8125
http://oorexx.svn.sourceforge.net/oorexx/?rev=8125&view=rev
Author: miesfeld
Date: 2012-07-29 23:30:43 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
Sync up ooDialog with small changes in User Guide
Modified Paths:
--------------
ooDialog/branches/4.2.0/doc/oodguide/Chapter02.xml
ooDialog/branches/4.2.0/trunk/examples/userGuide/exercises/Makefile.am
ooDialog/branches/4.2.0/trunk/install/ooDialog.nsi
ooDialog/branches/switchOODialog/switchOODialog420_410.nsi
ooDialog/trunk/examples/userGuide/exercises/Makefile.am
ooDialog/trunk/install/ooDialog.nsi
Removed Paths:
-------------
ooDialog/branches/4.2.0/trunk/examples/userGuide/exercises/Exercise01.rex
ooDialog/trunk/examples/userGuide/exercises/Exercise01.rex
Modified: ooDialog/branches/4.2.0/doc/oodguide/Chapter02.xml
===================================================================
--- ooDialog/branches/4.2.0/doc/oodguide/Chapter02.xml 2012-07-29 23:16:17 UTC (rev 8124)
+++ ooDialog/branches/4.2.0/doc/oodguide/Chapter02.xml 2012-07-29 23:30:43 UTC (rev 8125)
@@ -38,10 +38,11 @@
#########################################################################
-->
-<!-- Chapter02 - In The Beginning v01-00 31May12
+<!-- Chapter02 - In The Beginning v01-01 29Jly12
Changes:
v01-00 31May12: First version.
+ v01-01 29Jly12: Delete reference to (spurious) "Exercise01".
-->
<chapter id="chapTwo"><title>In The Beginning</title>
@@ -116,7 +117,7 @@
for debugging, but it can be dispensed with, and later we'll find out how.
For now, let's look at the <emphasis role="italic">Hello World</emphasis> code (excluding comments):
</para>
- <figure id="fig01"><title>Exercise01 Result</title>
+ <figure id="fig01"><title>The "Hello World" Dialog</title>
<mediaobject>
<imageobject>
<!-- Note! - if we include a /imagedata tag we get an error for DSSSL! -->
Deleted: ooDialog/branches/4.2.0/trunk/examples/userGuide/exercises/Exercise01.rex
===================================================================
--- ooDialog/branches/4.2.0/trunk/examples/userGuide/exercises/Exercise01.rex 2012-07-29 23:16:17 UTC (rev 8124)
+++ ooDialog/branches/4.2.0/trunk/examples/userGuide/exercises/Exercise01.rex 2012-07-29 23:30:43 UTC (rev 8125)
@@ -1,60 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* */
-/* Copyright (c) 2011-2012 Rexx Language Association. All rights reserved. */
-/* */
-/* This program and the accompanying materials are made available under */
-/* the terms of the Common Public License v1.0 which accompanies this */
-/* distribution. A copy is also available at the following address: */
-/* http://www.oorexx.org/license.html */
-/* */
-/* Redistribution and use in source and binary forms, with or */
-/* without modification, are permitted provided that the following */
-/* conditions are met: */
-/* */
-/* Redistributions of source code must retain the above copyright */
-/* notice, this list of conditions and the following disclaimer. */
-/* Redistributions in binary form must reproduce the above copyright */
-/* notice, this list of conditions and the following disclaimer in */
-/* the documentation and/or other materials provided with the distribution. */
-/* */
-/* Neither the name of Rexx Language Association nor the names */
-/* of its contributors may be used to endorse or promote products */
-/* derived from this software without specific prior written permission. */
-/* */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */
-/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */
-/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */
-/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */
-/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */
-/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */
-/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/*----------------------------------------------------------------------------*/
-
-/* Exercise 1: The "Hello World" dialog */
-
-/* Part 1 - the program: */
-
-dlg = .MyDialog~new -- create an instance "dlg" of MyDialog
-dlg~execute("SHOWTOP", IDI_DLG_OOREXX) -- show the window
-
-
-/* Part 2 - Tell ooRexx that ooDialog is required for this program */
-
-::requires "ooDialog.cls"
-
-
-/* Part 3 - Define the MyDialog class */
-
-::class MyDialog subclass UserDialog
-
-::method init -- auto-invoked when an instance is created.
- forward class (super) continue -- call my superclass so it can do its thing.
- /* Now create a window with the title "Hello World": */
- self~create(30, 30, 257, 123, "Hello World", "CENTER")
-
-
Modified: ooDialog/branches/4.2.0/trunk/examples/userGuide/exercises/Makefile.am
===================================================================
--- ooDialog/branches/4.2.0/trunk/examples/userGuide/exercises/Makefile.am 2012-07-29 23:16:17 UTC (rev 8124)
+++ ooDialog/branches/4.2.0/trunk/examples/userGuide/exercises/Makefile.am 2012-07-29 23:30:43 UTC (rev 8125)
@@ -42,5 +42,3 @@
MAINTAINERCLEANFILES = Makefile.in *~
-EXTRA_DIST = *.rex
-
Modified: ooDialog/branches/4.2.0/trunk/install/ooDialog.nsi
===================================================================
--- ooDialog/branches/4.2.0/trunk/install/ooDialog.nsi 2012-07-29 23:16:17 UTC (rev 8124)
+++ ooDialog/branches/4.2.0/trunk/install/ooDialog.nsi 2012-07-29 23:30:43 UTC (rev 8125)
@@ -325,11 +325,6 @@
; Add the files ...
File "${ExamplesDir}\userGuide\*.txt"
- ; Set the installation directory:
- SetOutPath $INSTDIR\samples\oodialog\userGuide\exercises
- ; Add the files ...
- File "${ExamplesDir}\userGuide\exercises\*.rex"
-
; Set output path to the installation directory.
SetOutPath $INSTDIR\samples\oodialog\userGuide\exercises\Exercise02
; Add the files ...
Modified: ooDialog/branches/switchOODialog/switchOODialog420_410.nsi
===================================================================
--- ooDialog/branches/switchOODialog/switchOODialog420_410.nsi 2012-07-29 23:16:17 UTC (rev 8124)
+++ ooDialog/branches/switchOODialog/switchOODialog420_410.nsi 2012-07-29 23:30:43 UTC (rev 8125)
@@ -343,11 +343,6 @@
; Add the files ...
File "${SamplesDir420}\userGuide\*.txt"
- ; Set the installation directory:
- SetOutPath $INSTDIR\samples\oodialog\userGuide\exercises
- ; Add the files ...
- File "${SamplesDir420}\userGuide\exercises\*.rex"
-
; Set output path to the installation directory.
SetOutPath $INSTDIR\samples\oodialog\userGuide\exercises\Exercise02
; Add the files ...
Deleted: ooDialog/trunk/examples/userGuide/exercises/Exercise01.rex
===================================================================
--- ooDialog/trunk/examples/userGuide/exercises/Exercise01.rex 2012-07-29 23:16:17 UTC (rev 8124)
+++ ooDialog/trunk/examples/userGuide/exercises/Exercise01.rex 2012-07-29 23:30:43 UTC (rev 8125)
@@ -1,60 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* */
-/* Copyright (c) 2011-2012 Rexx Language Association. All rights reserved. */
-/* */
-/* This program and the accompanying materials are made available under */
-/* the terms of the Common Public License v1.0 which accompanies this */
-/* distribution. A copy is also available at the following address: */
-/* http://www.oorexx.org/license.html */
-/* */
-/* Redistribution and use in source and binary forms, with or */
-/* without modification, are permitted provided that the following */
-/* conditions are met: */
-/* */
-/* Redistributions of source code must retain the above copyright */
-/* notice, this list of conditions and the following disclaimer. */
-/* Redistributions in binary form must reproduce the above copyright */
-/* notice, this list of conditions and the following disclaimer in */
-/* the documentation and/or other materials provided with the distribution. */
-/* */
-/* Neither the name of Rexx Language Association nor the names */
-/* of its contributors may be used to endorse or promote products */
-/* derived from this software without specific prior written permission. */
-/* */
-/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS */
-/* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT */
-/* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS */
-/* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT */
-/* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, */
-/* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED */
-/* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, */
-/* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY */
-/* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING */
-/* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS */
-/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-/* */
-/*----------------------------------------------------------------------------*/
-
-/* Exercise 1: The "Hello World" dialog */
-
-/* Part 1 - the program: */
-
-dlg = .MyDialog~new -- create an instance "dlg" of MyDialog
-dlg~execute("SHOWTOP", IDI_DLG_OOREXX) -- show the window
-
-
-/* Part 2 - Tell ooRexx that ooDialog is required for this program */
-
-::requires "ooDialog.cls"
-
-
-/* Part 3 - Define the MyDialog class */
-
-::class MyDialog subclass UserDialog
-
-::method init -- auto-invoked when an instance is created.
- forward class (super) continue -- call my superclass so it can do its thing.
- /* Now create a window with the title "Hello World": */
- self~create(30, 30, 257, 123, "Hello World", "CENTER")
-
-
Modified: ooDialog/trunk/examples/userGuide/exercises/Makefile.am
===================================================================
--- ooDialog/trunk/examples/userGuide/exercises/Makefile.am 2012-07-29 23:16:17 UTC (rev 8124)
+++ ooDialog/trunk/examples/userGuide/exercises/Makefile.am 2012-07-29 23:30:43 UTC (rev 8125)
@@ -42,5 +42,3 @@
MAINTAINERCLEANFILES = Makefile.in *~
-EXTRA_DIST = *.rex
-
Modified: ooDialog/trunk/install/ooDialog.nsi
===================================================================
--- ooDialog/trunk/install/ooDialog.nsi 2012-07-29 23:16:17 UTC (rev 8124)
+++ ooDialog/trunk/install/ooDialog.nsi 2012-07-29 23:30:43 UTC (rev 8125)
@@ -325,11 +325,6 @@
; Add the files ...
File "${ExamplesDir}\userGuide\*.txt"
- ; Set the installation directory:
- SetOutPath $INSTDIR\samples\oodialog\userGuide\exercises
- ; Add the files ...
- File "${ExamplesDir}\userGuide\exercises\*.rex"
-
; Set output path to the installation directory.
SetOutPath $INSTDIR\samples\oodialog\userGuide\exercises\Exercise02
; Add the files ...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|