Cured radiobutton non-setting by using BS_AUTORADIOBUTTON; cured gridg.cpp

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index d4ea423c083117bbfb6a603942021140a90f17d0..f49f7a857d7fb9ed4993c01763537644c150e9f2 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -125,8 +125,10 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.

+/*

   if ( want3D || wxStyleHasBorder(m_windowStyle) )
     msStyle |= WS_BORDER;
   if ( want3D || wxStyleHasBorder(m_windowStyle) )
     msStyle |= WS_BORDER;

+*/

 
 
   HWND the_handle = (HWND) parent->GetHWND() ;
 
 
   HWND the_handle = (HWND) parent->GetHWND() ;


@@ -152,7 +154,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
   }
 #endif
 
   }
 #endif
 

-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());

 
   SubclassWin((WXHWND)m_hWnd);
 
 
   SubclassWin((WXHWND)m_hWnd);
 


@@ -181,10 +183,10 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
    m_useCtl3D = TRUE;
   }
 #endif
    m_useCtl3D = TRUE;
   }
 #endif

-    if (GetFont())
+    if (GetFont().Ok())

     {
        SendMessage((HWND)m_radioButtons[i],WM_SETFONT,
     {
        SendMessage((HWND)m_radioButtons[i],WM_SETFONT,

-                    (WPARAM)GetFont()->GetResourceHandle(),0L);
+                    (WPARAM)GetFont().GetResourceHandle(),0L);

     }
     m_subControls.Append((wxObject *)newId);
   }
     }
     m_subControls.Append((wxObject *)newId);
   }


@@ -260,7 +262,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
   }
 #endif
 
   }
 #endif
 

-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());

 
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND)m_hWnd);
 
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND)m_hWnd);


@@ -405,7 +407,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
   int current_width, cyf;
 
   int cx1,cy1 ;
   int current_width, cyf;
 
   int cx1,cy1 ;

-  wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
+  wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());

   // Attempt to have a look coherent with other platforms:
   // We compute the biggest toggle dim, then we align all
   // items according this value.
   // Attempt to have a look coherent with other platforms:
   // We compute the biggest toggle dim, then we align all
   // items according this value.


@@ -421,7 +423,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
     {
       // It's a labelled toggle
       GetWindowText((HWND) m_radioButtons[i], buf, 300);
     {
       // It's a labelled toggle
       GetWindowText((HWND) m_radioButtons[i], buf, 300);

-      GetTextExtent(buf, &current_width, &cyf,NULL,NULL, GetFont());
+      GetTextExtent(buf, &current_width, &cyf,NULL,NULL, & GetFont());

       eachWidth = (int)(current_width + RADIO_SIZE);
       eachHeight = (int)((3*cyf)/2);
     }
       eachWidth = (int)(current_width + RADIO_SIZE);
       eachHeight = (int)((3*cyf)/2);
     }


@@ -501,7 +503,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
     {
       // It's a labeled item
       GetWindowText((HWND) m_radioButtons[i], buf, 300);
     {
       // It's a labeled item
       GetWindowText((HWND) m_radioButtons[i], buf, 300);

-      GetTextExtent(buf, &current_width, &cyf,NULL,NULL,GetFont());
+      GetTextExtent(buf, &current_width, &cyf,NULL,NULL, & GetFont());

 
       // How do we find out radio button bitmap size!!
       // By adjusting them carefully, manually :-)
 
       // How do we find out radio button bitmap size!!
       // By adjusting them carefully, manually :-)