Wrong class used in _setCallbackInfo

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

diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index bfc9f835ad6b7db5a590be9216a33d0bb7e3fd80..e4df8924462741969f23333aa2d434c61930f489 100644 (file)
--- a/src/os2/checkbox.cpp
+++ b/src/os2/checkbox.cpp
@@ -62,9 +62,7 @@ bool wxCheckBox::Create(
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -76,9 +74,7 @@ bool wxCheckBox::Create(
                        ,rPos
                        ,rSize
                        ,lStyle
                        ,rPos
                        ,rSize
                        ,lStyle

-#if wxUSE_VALIDATORS

                        ,rValidator
                        ,rValidator

-#endif

                        ,rsName
                       ))
         return FALSE;
                        ,rsName
                       ))
         return FALSE;


@@ -110,7 +106,8 @@ void wxCheckBox::SetLabel(
   const wxString&                   rsLabel
 )
 {
   const wxString&                   rsLabel
 )
 {

-    ::WinSetWindowText(GetHwnd(), rsLabel.c_str());
+    wxString                         sLabel=::wxPMTextToLabel(rsLabel);
+    ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str());

 } // end of wxCheckBox::SetLabel
 
 wxSize wxCheckBox::DoGetBestSize() const
 } // end of wxCheckBox::SetLabel
 
 wxSize wxCheckBox::DoGetBestSize() const


@@ -192,9 +189,7 @@ bool wxBitmapCheckBox::Create(
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {