don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

[wxWidgets.git] / src / os2 / radiobox.cpp

diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp
index 47a6fbdd9c0892761c6c05d8436600243ee8579a..4e979893404f558ca39366d95885ee1ba795621f 100644 (file)
--- a/src/os2/radiobox.cpp
+++ b/src/os2/radiobox.cpp
@@ -86,7 +86,7 @@ void wxRadioBox::AdjustButtons(
 , int                               nY
 , int                               nWidth
 , int                               nHeight
 , int                               nY
 , int                               nWidth
 , int                               nHeight

-, long                              lSizeFlags
+, int                               nSizeFlags

 )
 {
     wxSize                          vMaxSize;
 )
 {
     wxSize                          vMaxSize;


@@ -264,7 +264,11 @@ bool wxRadioBox::Create(
     // System fonts are too big in OS/2 and they are blue
     // We want smaller fonts and black by default.
     //
     // System fonts are too big in OS/2 and they are blue
     // We want smaller fonts and black by default.
     //

-    wxFont&                         rFont = *wxSMALL_FONT;
+    wxFont*                          pTextFont = new wxFont( 10
+                                                            ,wxMODERN
+                                                            ,wxNORMAL
+                                                            ,wxNORMAL
+                                                           );

     wxColour                        vColour;
     LONG                            lColor;
 
     wxColour                        vColour;
     LONG                            lColor;
 


@@ -279,22 +283,26 @@ bool wxRadioBox::Create(
     //
     // Common initialization
     //
     //
     // Common initialization
     //

-    if (!OS2CreateControl( pParent
-                          ,vId
-                          ,rPos
-                          ,rSize
-                          ,lStyle
+    if (!CreateControl( pParent
+                       ,vId
+                       ,rPos
+                       ,rSize
+                       ,lStyle

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-                          ,rVal
+                       ,rVal

 #endif
 #endif

-                          ,rsName
-                         ))
+                       ,rsName
+                      ))

 
 
 
 
     if (!OS2CreateControl( "STATIC"
 
 
 
 
     if (!OS2CreateControl( "STATIC"

-                          ,SS_GROUPBOX | WS_GROUP
+#if RADIOBTN_PARENT_IS_RADIOBOX
+                          ,SS_GROUPBOX | WS_GROUP | WS_CLIPCHILDREN
+#else
+                          ,SS_GROUPBOX | WS_GROUP | WS_CLIPSIBLINGS
+#endif

                           ,rPos
                           ,rSize
                           ,rsTitle
                           ,rPos
                           ,rSize
                           ,rsTitle


@@ -315,9 +323,9 @@ bool wxRadioBox::Create(
     m_pnRadioWidth   = new int[nNum];
     m_pnRadioHeight  = new int[nNum];
 
     m_pnRadioWidth   = new int[nNum];
     m_pnRadioHeight  = new int[nNum];
 

-    if (rFont.Ok())
+    if (pTextFont->Ok())

     {
     {

-        hFont = rFont.GetResourceHandle();
+        hFont = pTextFont->GetResourceHandle();

     }
 
     for (int i = 0; i < nNum; i++)
     }
 
     for (int i = 0; i < nNum; i++)


@@ -341,11 +349,19 @@ bool wxRadioBox::Create(
                                                                          ,NULL
                                                                          ,NULL
                                                                         );
                                                                          ,NULL
                                                                          ,NULL
                                                                         );

+        lColor = (LONG)vColour.GetPixel();

         ::WinSetPresParam( hWndBtn
                           ,PP_FOREGROUNDCOLOR
                           ,sizeof(LONG)
                           ,(PVOID)&lColor
                          );
         ::WinSetPresParam( hWndBtn
                           ,PP_FOREGROUNDCOLOR
                           ,sizeof(LONG)
                           ,(PVOID)&lColor
                          );

+        lColor = (LONG)m_backgroundColour.GetPixel();
+
+        ::WinSetPresParam( hWndBtn
+                          ,PP_BACKGROUNDCOLOR
+                          ,sizeof(LONG)
+                          ,(PVOID)&lColor
+                         );

         if (!hWndBtn)
         {
             return FALSE;
         if (!hWndBtn)
         {
             return FALSE;


@@ -353,7 +369,7 @@ bool wxRadioBox::Create(
         m_ahRadioButtons[i] = (WXHWND)hWndBtn;
         SubclassRadioButton((WXHWND)hWndBtn);
         wxOS2SetFont( hWndBtn
         m_ahRadioButtons[i] = (WXHWND)hWndBtn;
         SubclassRadioButton((WXHWND)hWndBtn);
         wxOS2SetFont( hWndBtn

-                     ,rFont
+                     ,*pTextFont

                     );
         ::WinSetWindowULong(hWndBtn, QWL_USER, (ULONG)this);
         m_aSubControls.Add(nNewId);
                     );
         ::WinSetWindowULong(hWndBtn, QWL_USER, (ULONG)this);
         m_aSubControls.Add(nNewId);


@@ -373,18 +389,27 @@ bool wxRadioBox::Create(
                              ,NULL
                              ,NULL
                             );
                              ,NULL
                              ,NULL
                             );

-     SetFont(*wxSMALL_FONT);
+    SetFont(*pTextFont);
+    lColor = (LONG)vColour.GetPixel();

     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

+    lColor = (LONG)m_backgroundColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );

     SetSelection(0);
     SetSize( rPos.x
             ,rPos.y
             ,rSize.x
             ,rSize.y
            );
     SetSelection(0);
     SetSize( rPos.x
             ,rPos.y
             ,rSize.x
             ,rSize.y
            );

+    delete pTextFont;

     return TRUE;
 } // end of wxRadioBox::Create
 
     return TRUE;
 } // end of wxRadioBox::Create
 


@@ -480,7 +505,9 @@ void wxRadioBox::DoSetSize(
 
     if (pParent)
     {
 
     if (pParent)
     {

-        nYy = pParent->GetClientSize().y - (nYy + nHeight);
+        int                         nOS2Height = GetOS2ParentHeight(pParent);
+
+        nYy = nOS2Height - (nYy + nHeight);

         nYOffset = nYy + nHeight;
     }
     else
         nYOffset = nYy + nHeight;
     }
     else