X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d4b632ba3c0e5e5c43412d2d7a2b485b8fcebf2..4aaef122cbbd5bbe0e70b824e320458e2329dd13:/src/os2/checkbox.cpp

diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index 035c4504cc..9f5c9663b8 100644
--- a/src/os2/checkbox.cpp
+++ b/src/os2/checkbox.cpp
@@ -23,10 +23,8 @@
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
-#endif
 
 // ============================================================================
 // implementation
@@ -50,11 +48,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,
            const wxSize& size, long style,
 #if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator,
-#  else
            const wxValidator& validator,
-#  endif
 #endif
            const wxString& name)
 {
@@ -88,6 +82,14 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);
 
+    LONG                            lColor = (LONG)m_backgroundColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+
     SetFont(parent->GetFont());
 
     SetSize(x, y, width, height);
@@ -100,7 +102,7 @@ void wxCheckBox::SetLabel(const wxString& label)
     // TODO
 }
 
-wxSize wxCheckBox::DoGetBestSize()
+wxSize wxCheckBox::DoGetBestSize() const
 {
     int wCheckbox, hCheckbox;
 
@@ -185,11 +187,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
            const wxPoint& pos,
            const wxSize& size, long style,
 #if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator,
-#  else
            const wxValidator& validator,
-#  endif
 #endif
            const wxString& name)
 {
@@ -215,7 +213,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
 
     checkWidth = -1 ;
     checkHeight = -1 ;
-    long msStyle = CHECK_FLAGS;
+//    long msStyle = CHECK_FLAGS;
 
     HWND wx_button = 0; // TODO: Create the bitmap checkbox