Use wxAlphaPixelData if the source bitmap depth is 32 or if on wxGTK and there is...

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

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 1d3557cd10319c109df7c10c8c4ac4d3255d7c0a..168967fa14b1ac85fef76e84a0c3e117fa85240c 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobut.h
+// Name:        wx/os2/radiobut.h
 // Purpose:     wxRadioButton class
 // Author:      David Webster
 // Modified by:
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-class WXDLLEXPORT wxRadioButton: public wxControl
+class WXDLLIMPEXP_CORE wxRadioButton: public wxControl
 {
 public:
     inline wxRadioButton() { Init(); }
@@ -24,9 +24,7 @@ public:
                          ,const wxPoint&     rPos = wxDefaultPosition
                          ,const wxSize&      rSize = wxDefaultSize
                          ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                          ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                          ,const wxString&    rsName = wxRadioButtonNameStr
                          )
     {
@@ -38,9 +36,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rValidator
-#endif
                ,rsName
               );
     }
@@ -51,9 +47,7 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                 ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                 ,const wxString&    rsName = wxRadioButtonNameStr
                );
 
@@ -61,12 +55,18 @@ public:
     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:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     virtual wxSize DoGetBestSize() const;
 
 private: