Better fix

[wxWidgets.git] / include / wx / os2 / radiobut.h

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 1d3557cd10319c109df7c10c8c4ac4d3255d7c0a..1e71293c8114b375a2f970934fca572a4d5bbb2a 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -24,9 +24,7 @@ public:
                          ,const wxPoint&     rPos = wxDefaultPosition
                          ,const wxSize&      rSize = wxDefaultSize
                          ,long               lStyle = 0
                          ,const wxPoint&     rPos = wxDefaultPosition
                          ,const wxSize&      rSize = wxDefaultSize
                          ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                          ,const wxValidator& rValidator = wxDefaultValidator
                          ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                          ,const wxString&    rsName = wxRadioButtonNameStr
                          )
     {
                          ,const wxString&    rsName = wxRadioButtonNameStr
                          )
     {


@@ -38,9 +36,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -51,9 +47,7 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxRadioButtonNameStr
                );
 
                 ,const wxString&    rsName = wxRadioButtonNameStr
                );
 


@@ -61,12 +55,18 @@ public:
     virtual void SetValue(bool bVal);
     virtual bool GetValue(void) const ;
 
     virtual void SetValue(bool bVal);
     virtual bool GetValue(void) const ;
 

-    bool         OS2Command( WXUINT wParam
-                            ,WXWORD wId
-                           );
-    void         Command(wxCommandEvent& rEvent);
-    virtual void SetFocus(void);
+    bool            OS2Command( WXUINT wParam
+                               ,WXWORD wId
+                              );
+    void            Command(wxCommandEvent& rEvent);
+    virtual MRESULT OS2WindowProc( WXUINT   uMsg
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );
+    virtual void    SetFocus(void);
+

 protected:
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

     virtual wxSize DoGetBestSize() const;
 
 private:
     virtual wxSize DoGetBestSize() const;
 
 private: