Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 753edfc5bed923c04515192e470ef7c51878cc34..7e8f9ac1732bb9b2a10fcdf645efcc9327808145 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobut.h
+// Name:        wx/os2/radiobut.h

 // Purpose:     wxRadioButton class
 // Author:      David Webster
 // Modified by:
 // Created:     10/12/99
 // Purpose:     wxRadioButton class
 // Author:      David Webster
 // Modified by:
 // Created:     10/12/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,7 +13,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-class WXDLLEXPORT wxRadioButton: public wxControl
+class WXDLLIMPEXP_CORE wxRadioButton: public wxControl

 {
 public:
     inline wxRadioButton() { Init(); }
 {
 public:
     inline wxRadioButton() { Init(); }


@@ -24,9 +23,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 +35,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -51,9 +46,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
                );
 


@@ -72,6 +65,7 @@ public:
     virtual void    SetFocus(void);
 
 protected:
     virtual void    SetFocus(void);
 
 protected:

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

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