>From 5c1059f40498e49661d5a5b12440fa9eb0f2cb2f Mon Sep 17 00:00:00 2001 From: Gwenael Casaccio Date: Mon, 21 Oct 2013 14:54:16 +0200 Subject: [PATCH] Remove GtkAbstractConcreteWidget --- packages/visualgst/ChangeLog | 7 ++++ packages/visualgst/GtkAbstractConcreteWidget.st | 41 ----------------------- packages/visualgst/GtkConcreteWidget.st | 2 +- packages/visualgst/GtkSidebarWidget.st | 3 +- packages/visualgst/Tests/GtkConcreteWidgetTest.st | 6 ---- packages/visualgst/package.xml | 2 -- 6 files changed, 9 insertions(+), 52 deletions(-) delete mode 100644 packages/visualgst/GtkAbstractConcreteWidget.st diff --git a/packages/visualgst/ChangeLog b/packages/visualgst/ChangeLog index 8f34236..4d0c45d 100644 --- a/packages/visualgst/ChangeLog +++ b/packages/visualgst/ChangeLog @@ -1,5 +1,12 @@ 2013-10-21 Gwenael Casaccio + * GtkConcreteWidget.st: Object is the superclass. + * GtkAbstractConcreteWidget.st: Remove it. + * GtkSidebarWidget.st: Doesn't rely on GtkAbstractConcreteWidget. + * Tests/GtkConcreteWidgetTest.st: Remove GtkAbstractConcreteWidget test. + +2013-10-21 Gwenael Casaccio + * Debugger/GtkDebugger.st: Makes the debugger non-blocking and fix the continue back into GTK/Event-Loop/C-code. * Debugger/GtkTextWidget.st: Makes the debugger non-blocking and fix the continue back into GTK/Event-Loop/C-code. * Misc/TaskQueue.st : Add a queue of tasks. diff --git a/packages/visualgst/GtkAbstractConcreteWidget.st b/packages/visualgst/GtkAbstractConcreteWidget.st deleted file mode 100644 index e4f934f..0000000 --- a/packages/visualgst/GtkAbstractConcreteWidget.st +++ /dev/null @@ -1,41 +0,0 @@ -"====================================================================== -| -| GtkAbstractConcreteWidget class definition -| -======================================================================" - -"====================================================================== -| -| Copyright (c) 2013 -| Gwenael Casaccio , -| -| -| This file is part of VisualGST. -| -| Permission is hereby granted, free of charge, to any person obtaining -| a copy of this software and associated documentation files (the -| 'Software'), to deal in the Software without restriction, including -| without limitation the rights to use, copy, modify, merge, publish, -| distribute, sublicense, and/or sell copies of the Software, and to -| permit persons to whom the Software is furnished to do so, subject to -| the following conditions: -| -| The above copyright notice and this permission notice shall be -| included in all copies or substantial portions of the Software. -| -| THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -| IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -| CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -| TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -| SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -| -======================================================================" - -Smalltalk.Object subclass: GtkAbstractConcreteWidget [ - - hideAll [ - ] -] - diff --git a/packages/visualgst/GtkConcreteWidget.st b/packages/visualgst/GtkConcreteWidget.st index 8a5e0d2..26973ec 100644 --- a/packages/visualgst/GtkConcreteWidget.st +++ b/packages/visualgst/GtkConcreteWidget.st @@ -33,7 +33,7 @@ | ======================================================================" -GtkAbstractConcreteWidget subclass: GtkConcreteWidget [ +Object subclass: GtkConcreteWidget [ | child parentWindow popupMenu | GtkConcreteWidget class >> parentWindow: aGtkWindow [ diff --git a/packages/visualgst/GtkSidebarWidget.st b/packages/visualgst/GtkSidebarWidget.st index 8f577e5..86e3592 100644 --- a/packages/visualgst/GtkSidebarWidget.st +++ b/packages/visualgst/GtkSidebarWidget.st @@ -45,7 +45,6 @@ GtkConcreteWidget subclass: GtkSidebarWidget [ yourself. self mainWidget: paned. widgetEvents := Dictionary new. - activeWidget := GtkAbstractConcreteWidget new. widgets := OrderedCollection new ] @@ -72,7 +71,7 @@ GtkConcreteWidget subclass: GtkSidebarWidget [ show: anIndex [ - activeWidget hideAll. + activeWidget ifNotNil: [ :aWidget | aWidget hideAll ]. self mainWidget showAll. self mainWidget setCurrentPage: anIndex - 1. activeWidget := (widgets at: anIndex) diff --git a/packages/visualgst/Tests/GtkConcreteWidgetTest.st b/packages/visualgst/Tests/GtkConcreteWidgetTest.st index 963c81f..9afb2fe 100644 --- a/packages/visualgst/Tests/GtkConcreteWidgetTest.st +++ b/packages/visualgst/Tests/GtkConcreteWidgetTest.st @@ -52,12 +52,6 @@ TestCase subclass: GtkConcreteWidgetTest [ ^ false ] - testAbstractWidget [ - - - self should: [ GtkAbstractConcreteWidget new hideAll. true ] - ] - testConcreteWidget [ diff --git a/packages/visualgst/package.xml b/packages/visualgst/package.xml index 52e7a31..0fed263 100644 --- a/packages/visualgst/package.xml +++ b/packages/visualgst/package.xml @@ -162,7 +162,6 @@ Category/ClassCategory.st Category/AbstractNamespace.st Category/Class.st - GtkAbstractConcreteWidget.st GtkConcreteWidget.st GtkScrollTreeWidget.st GtkSimpleListWidget.st @@ -391,7 +390,6 @@ Category/ClassCategory.st Category/AbstractNamespace.st Category/Class.st - GtkAbstractConcreteWidget.st GtkConcreteWidget.st GtkScrollTreeWidget.st GtkSimpleListWidget.st -- 1.8.3.2