Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/motif/radiobut.h b/include/wx/motif/radiobut.h
index 514a731c9033902f3a49d78d6792be4c0d8d1bc7..71b5b72b5a6fd1572a53c7eea5e75c8e05eb4543 100644 (file)
--- a/include/wx/motif/radiobut.h
+++ b/include/wx/motif/radiobut.h
@@ -1,31 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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_
 

-#ifdef __GNUG__
-#pragma interface "radiobut.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
-
-class WXDLLEXPORT wxRadioButton: public wxControl
+class WXDLLIMPEXP_CORE wxRadioButton: public wxControl

 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)

-protected:

 public:
     wxRadioButton();
 public:
     wxRadioButton();

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

     inline wxRadioButton(wxWindow *parent, wxWindowID id,
         const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
     inline wxRadioButton(wxWindow *parent, wxWindowID id,
         const wxString& label,
         const wxPoint& pos = wxDefaultPosition,


@@ -35,60 +28,35 @@ 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
     // Implementation

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);

     virtual void ChangeBackgroundColour();
     virtual void ChangeBackgroundColour();

-    virtual void ChangeForegroundColour();
-};

 
 

-// Not implemented
-#if 0
-class WXDLLEXPORT wxBitmap ;
-
-WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
-
-class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
-{
-    DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
+    // *this function is an implementation detail*
+    // clears the selection in the radiobuttons in the cycle
+    // and returns the old selection (if any)
+    wxRadioButton* ClearSelections();

 protected:
 protected:

-    wxBitmap *theButtonBitmap;
-public:
-    inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
-    inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
-        const wxBitmap *label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxBitmapRadioButtonNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-    
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxBitmap *label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxBitmapRadioButtonNameStr);
-    
-    virtual void SetLabel(const wxBitmap *label);
-    virtual void SetValue(bool val) ;
-    virtual bool GetValue() const ;
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+private:
+    wxRadioButton* AddInCycle(wxRadioButton* cycle);
+    void RemoveFromCycle();
+    wxRadioButton* NextInCycle() { return m_cycle; }
+
+    wxRadioButton *m_cycle;

 };
 };

-#endif

 
 #endif
 // _WX_RADIOBUT_H_
 
 #endif
 // _WX_RADIOBUT_H_