Simplified and extended compiler detection for OS/2.

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

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index ba7e54ab97160f94e1b33ccce4fac96f5b2310a5..9fadd8eb266c44ebdcf72dd0a2c1f31b01a3c3c7 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -112,7 +112,7 @@ wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
 
     Init();
 
 
     Init();
 

-    (void)Create(parent, id, title, pos, size, chs.GetCount(), 
+    (void)Create(parent, id, title, pos, size, chs.GetCount(),

                  chs.GetStrings(), majorDim, style, val, name);
 }
 
                  chs.GetStrings(), majorDim, style, val, name);
 }
 


@@ -129,7 +129,7 @@ bool wxRadioBox::Create(wxWindow *parent,
 {
     wxCArrayString chs(choices);
 
 {
     wxCArrayString chs(choices);
 

-    return Create(parent, id, title, pos, size, chs.GetCount(), 
+    return Create(parent, id, title, pos, size, chs.GetCount(),

                   chs.GetStrings(), majorDim, style, val, name);
 }
 
                   chs.GetStrings(), majorDim, style, val, name);
 }
 


@@ -309,7 +309,7 @@ void wxRadioBox::OnRadioButton(wxEvent& event)
 
 wxString wxRadioBox::GetString(int n) const
 {
 
 wxString wxRadioBox::GetString(int n) const
 {

-    wxCHECK_MSG( IsValid(n), _T(""),
+    wxCHECK_MSG( IsValid(n), wxEmptyString,

                  _T("invalid index in wxRadioBox::GetString") );
 
     return m_buttons[n]->GetLabel();
                  _T("invalid index in wxRadioBox::GetString") );
 
     return m_buttons[n]->GetLabel();


@@ -445,7 +445,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
 
     wxSize sizeBtn = GetMaxButtonSize();
     wxPoint ptOrigin = GetBoxAreaOrigin();
 
     wxSize sizeBtn = GetMaxButtonSize();
     wxPoint ptOrigin = GetBoxAreaOrigin();

-    wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
+    wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint();

 
     x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x;
     y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;
 
     x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x;
     y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;