VC warning fixes.

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

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index f0f19718b05c291631af1949a2d063fb5e6bc751..3955dba0642fbd6d5884d4719ccf8207a120b291 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -67,7 +67,7 @@ wxBEGIN_FLAGS( wxCheckBoxStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
-    
+
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
@@ -102,7 +102,7 @@ wxEND_PROPERTIES_TABLE()
 wxBEGIN_HANDLERS_TABLE(wxCheckBox)
 wxEND_HANDLERS_TABLE()
 
-wxCONSTRUCTOR_6( wxCheckBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+wxCONSTRUCTOR_6( wxCheckBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 #endif
@@ -129,7 +129,7 @@ bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
     event.SetEventObject(this);
     ProcessCommand(event);
 
-    return TRUE;
+    return true;
 }
 
 bool wxCheckBox::Create(wxWindow *parent,
@@ -141,7 +141,7 @@ bool wxCheckBox::Create(wxWindow *parent,
                         const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
-        return FALSE;
+        return false;
 
     long msStyle = WS_TABSTOP;
 
@@ -194,25 +194,21 @@ wxSize wxCheckBox::DoGetBestSize() const
         wCheckbox = s_checkSize;
         hCheckbox = s_checkSize;
     }
+#ifdef __WXWINCE__
+    hCheckbox += 1;
+#endif
 
     return wxSize(wCheckbox, hCheckbox);
 }
 
 void wxCheckBox::SetValue(bool val)
 {
-    if (val)
-    {
-        Set3StateValue(wxCHK_CHECKED);
-    }
-    else
-    {
-        Set3StateValue(wxCHK_UNCHECKED);
-    }
+    Set3StateValue(val ? wxCHK_CHECKED : wxCHK_UNCHECKED);
 }
 
 bool wxCheckBox::GetValue() const
 {
-    return (Get3StateValue() != 0);
+    return Get3StateValue() != wxCHK_UNCHECKED;
 }
 
 void wxCheckBox::Command(wxCommandEvent& event)
@@ -237,13 +233,7 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {
-#ifdef __WIN32__
     return (wxCheckBoxState) ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0);
-#else
-    return (wxCheckBoxState) ((::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0)
-        & 0x001) == 0x001);
-#endif
-
 }
 
 #endif // wxUSE_CHECKBOX