fix the wrong #ifdef WXWIN_COMPATIBILITY_2_8 checks, #if should be used (#9644)

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

diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h
index febab7e4c600c859815cd0c58ac8f16929a31a42..71b5b72b5a6fd1572a53c7eea5e75c8e05eb4543 100644 (file)
--- a/include/wx/motif/radiobut.h
+++ b/include/wx/motif/radiobut.h
@@ -1,23 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxRadioButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxRadioButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 public:
     wxRadioButton();
 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 public:
     wxRadioButton();

-    ~wxRadioButton() { RemoveFromCycle(); }
+    virtual ~wxRadioButton() { RemoveFromCycle(); }

 
     inline wxRadioButton(wxWindow *parent, wxWindowID id,
         const wxString& label,
 
     inline wxRadioButton(wxWindow *parent, wxWindowID id,
         const wxString& label,


@@ -28,19 +28,19 @@ public:
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }

-    
+

     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxRadioButtonNameStr);
     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxRadioButtonNameStr);

-    
+

     virtual void SetValue(bool val);
     virtual bool GetValue() const ;
     virtual void SetValue(bool val);
     virtual bool GetValue() const ;

-    
+

     void Command(wxCommandEvent& event);
     void Command(wxCommandEvent& event);

-    
+

     // Implementation
     virtual void ChangeBackgroundColour();
 
     // Implementation
     virtual void ChangeBackgroundColour();
 


@@ -48,6 +48,8 @@ public:
     // clears the selection in the radiobuttons in the cycle
     // and returns the old selection (if any)
     wxRadioButton* ClearSelections();
     // clears the selection in the radiobuttons in the cycle
     // and returns the old selection (if any)
     wxRadioButton* ClearSelections();

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

 private:
     wxRadioButton* AddInCycle(wxRadioButton* cycle);
     void RemoveFromCycle();
 private:
     wxRadioButton* AddInCycle(wxRadioButton* cycle);
     void RemoveFromCycle();