--- a/WinWorkstation.st Tue Apr 25 11:20:05 2017 +0200
+++ b/WinWorkstation.st Sat May 06 11:26:33 2017 +0100
@@ -19,7 +19,7 @@
classVariableNames:'BeepDuration NativeDialogs NativeFileDialogs NativeWidgets
NativeWidgetClassTable StandardColorValues IgnoreSysColorChanges
IgnoreFontChanges SystemColorValues CanEndSession
- VerboseNativeDialogs '
+ VerboseNativeDialogs'
poolDictionaries:''
category:'Interface-Graphics'
!
@@ -6495,7 +6495,7 @@
' Peak User Objects = ' errorPrint. counts second errorPrintCR.
' # GDI Objects = ' errorPrint. counts third errorPrintCR.
' Peak GDI Objects = ' errorPrint. counts fourth errorPrintCR.
-!
+!
printHandleCounts
"show prim values"
@@ -8090,55 +8090,6 @@
"Modified: / 28-01-2012 / 10:20:30 / cg"
!
-destroyGC:aGCId
-%{
- if (__isExternalAddress(aGCId)) {
- struct gcData *gcData = _GCDATA(aGCId);
-
- if (gcData == NULL) {
- console_fprintf(stderr, "WinWorkstation [warning]: trying to destroy GC twice\n");
- RETURN(self);
- }
-
-#ifdef COUNT_RESOURCES
- __cnt_gcData--;
- RESPRINTF(("DestroyGcData %d\n",__cnt_gcData));
-#endif
-
-#ifdef CACHE_LAST_DC
- if (lastGcData == gcData) {
- _releaseDC(gcData);
- }
-#endif
- __ExternalAddressInstPtr(aGCId)->e_address = NULL;
-
- freeGcData(gcData);
- }
-%}
-!
-
-destroyPixmap:aDrawableId
-
-%{ /* NOCONTEXT */
- if (__isExternalAddress(aDrawableId) && ISCONNECTED) {
- HANDLE bitmapHandle = _HANDLEVal(aDrawableId);
-
- if (bitmapHandle) {
-#ifdef COUNT_BMP_RESOURCES
- __cnt_bitmap--;
- RES_BMP_PRINTF(("DestroyPixmap %x %d\n", bitmapHandle, __cnt_bitmap));
-#endif
- _DeleteObject(bitmapHandle, __LINE__);
- }
- }
-%}
-!
-
-destroyView:aView withId:aWindowId
- self primDestroyView:aView withId:aWindowId.
- self removeKnownView:aView withId:aWindowId
-!
-
dcGetClipBoxForGC: gcId
"Return clipping box for given device context (as #(left top right bottom) ). "
@@ -8201,7 +8152,7 @@
err:;
%}.
^ self primitiveFailed: error
-!
+!
dcUnlockForGC:gcId
"Unlocks and __destroy__ a device context for given GC previously
@@ -8224,7 +8175,56 @@
err:;
%}.
^ self primitiveFailed: error
-!
+!
+
+destroyGC:aGCId
+%{
+ if (__isExternalAddress(aGCId)) {
+ struct gcData *gcData = _GCDATA(aGCId);
+
+ if (gcData == NULL) {
+ console_fprintf(stderr, "WinWorkstation [warning]: trying to destroy GC twice\n");
+ RETURN(self);
+ }
+
+#ifdef COUNT_RESOURCES
+ __cnt_gcData--;
+ RESPRINTF(("DestroyGcData %d\n",__cnt_gcData));
+#endif
+
+#ifdef CACHE_LAST_DC
+ if (lastGcData == gcData) {
+ _releaseDC(gcData);
+ }
+#endif
+ __ExternalAddressInstPtr(aGCId)->e_address = NULL;
+
+ freeGcData(gcData);
+ }
+%}
+!
+
+destroyPixmap:aDrawableId
+
+%{ /* NOCONTEXT */
+ if (__isExternalAddress(aDrawableId) && ISCONNECTED) {
+ HANDLE bitmapHandle = _HANDLEVal(aDrawableId);
+
+ if (bitmapHandle) {
+#ifdef COUNT_BMP_RESOURCES
+ __cnt_bitmap--;
+ RES_BMP_PRINTF(("DestroyPixmap %x %d\n", bitmapHandle, __cnt_bitmap));
+#endif
+ _DeleteObject(bitmapHandle, __LINE__);
+ }
+ }
+%}
+!
+
+destroyView:aView withId:aWindowId
+ self primDestroyView:aView withId:aWindowId.
+ self removeKnownView:aView withId:aWindowId
+!
gcFor:aDrawableId
@@ -13171,8 +13171,9 @@
The non-nil case is the lowlevel entry, where state must include any shift/ctrl information
(not very user friendly)"
- 'WinWorkstation [warning]: sendKeyOrButtonEvent unimplemented' infoPrintCR.
- ^ false
+ super sendKeyOrButtonEvent:typeSymbol x:xPos y:yPos keyOrButton:keySymCodeOrButtonNr state:stateMask toViewId:targetId
+
+ "Modified: / 06-05-2017 / 11:19:03 / jv"
! !
!WinWorkstation methodsFor:'font stuff'!
@@ -19612,6 +19613,11 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !