[Oorexx-svn] SF.net SVN: oorexx:[5231] main/trunk/extensions/platform/windows/oodialog

[<mie...@us...>]

Revision: 5231
          http://oorexx.svn.sourceforge.net/oorexx/?rev=5231&view=rev
Author:   miesfeld
Date:     2009-10-02 17:06:41 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
Fix a problem with the default tab style for a radio button

Modified Paths:
--------------
    main/trunk/extensions/platform/windows/oodialog/oodUser.cpp
    main/trunk/extensions/platform/windows/oodialog/resdlg.cls

Modified: main/trunk/extensions/platform/windows/oodialog/oodUser.cpp
===================================================================
--- main/trunk/extensions/platform/windows/oodialog/oodUser.cpp	2009-10-02 04:19:01 UTC (rev 5230)
+++ main/trunk/extensions/platform/windows/oodialog/oodUser.cpp	2009-10-02 17:06:41 UTC (rev 5231)
@@ -399,9 +399,9 @@
 }
 
 
-uint32_t getCommonButtonStyles(uint32_t style, CSTRING opts)
+uint32_t getCommonButtonStyles(uint32_t style, CSTRING opts, oodControl_t button)
 {
-    style |= getCommonWindowStyles(opts, false, true);
+    style |= getCommonWindowStyles(opts, false, button != winRadioButton);
 
     if ( StrStrI(opts, "OWNER")     != NULL ) style |= BS_OWNERDRAW;
     if ( StrStrI(opts, "BITMAP")    != NULL ) style |= BS_BITMAP;
@@ -1243,7 +1243,7 @@
 
     uint32_t style = WS_CHILD;
     style |= ( StrStrI(opts, "DEFAULT") != NULL ? BS_DEFPUSHBUTTON : BS_PUSHBUTTON );
-    style = getCommonButtonStyles(style, opts);
+    style = getCommonButtonStyles(style, opts, winPushButton);
 
     addToDialogTemplate(pcdd, ButtonAtom, NULL, id, x, y, cx, cy, label, style);
 
@@ -1345,7 +1345,7 @@
     {
         style |= ( StrStrI(opts, "3STATE") != NULL ? BS_AUTO3STATE : BS_AUTOCHECKBOX );
     }
-    style = getCommonButtonStyles(style, opts);
+    style = getCommonButtonStyles(style, opts, ctrl);
 
     addToDialogTemplate(pcdd, ButtonAtom, NULL, id, x, y, cx, cy, label, style);
 

Modified: main/trunk/extensions/platform/windows/oodialog/resdlg.cls
===================================================================
--- main/trunk/extensions/platform/windows/oodialog/resdlg.cls	2009-10-02 04:19:01 UTC (rev 5230)
+++ main/trunk/extensions/platform/windows/oodialog/resdlg.cls	2009-10-02 17:06:41 UTC (rev 5231)
@@ -49,11 +49,10 @@
    expose library resource dlgData.
    use arg library, resource, dlgData., includeFile
 
-   if arg(4, 'E') then ret = self~init:super(library, resource, dlgData., includeFile)
-   else ret = self~init:super(library, resource, dlgData.)
-   if ret \= 0 then return ret
+   forward class (super) continue
+   if result \= 0 then return result
 
-   if \ resource~datatype("N") then resource = self~resolveSymbolicId(resource)
+   if \ resource~datatype("W") then resource = self~resolveSymbolicId(resource)
    if resource < 1 then self~initCode = -1
 
    return self~initCode


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.