Avoid an assert in wxFrame::SetTitle

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 433c5dab7f34b98527ead8a39e169294c052601d..73c40bd139797de58ba32506ef94287dd45a493a 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -294,7 +294,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     m_radioHeight = new int[n];
 
     WXHFONT hfont = 0;
     m_radioHeight = new int[n];
 
     WXHFONT hfont = 0;

-    wxFont& font = GetFont();
+    wxFont font = GetFont();

     if ( font.Ok() )
     {
         hfont = font.GetResourceHandle();
     if ( font.Ok() )
     {
         hfont = font.GetResourceHandle();


@@ -466,7 +466,7 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
 {
     // the radiobox should be big enough for its buttons
     int cx1, cy1;
 {
     // the radiobox should be big enough for its buttons
     int cx1, cy1;

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

 
     int extraHeight = cy1;
 
 
     int extraHeight = cy1;
 


@@ -525,7 +525,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 #endif
 
     int cx1, cy1;
 #endif
 
     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.


@@ -1035,7 +1035,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
 
                 wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
 
 
                 wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
 

-                bool processed = TRUE;
+                bool processed wxDUMMY_INITIALIZE(true);

 
                 // HELPINFO doesn't seem to be supported on WinCE.
 #ifndef __WXWINCE__
 
                 // HELPINFO doesn't seem to be supported on WinCE.
 #ifndef __WXWINCE__


@@ -1071,7 +1071,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
                     processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
                 }
                 else
                     processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
                 }
                 else

-                    processed = FALSE;
+                    processed = false;

 #endif
                 if (processed)
                     return 0;
 #endif
                 if (processed)
                     return 0;