X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b06ac1f24a3e25aa88f813ac6d91452b907e993..07014b5a0af156077f85ae45b6c5d5162d5cfb76:/include/wx/gtk/radiobox.h

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index d1c29dd7bd..1f2fb13bf5 100644
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -1,19 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobox.h
+// Name:        wx/gtk/radiobox.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifndef __GTKRADIOBOXH__
-#define __GTKRADIOBOXH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
+#ifndef _WX_GTK_RADIOBOX_H_
+#define _WX_GTK_RADIOBOX_H_
 
 #include "wx/bitmap.h"
 
@@ -21,9 +16,11 @@
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
-class wxRadioBox: public wxControl
+class WXDLLIMPEXP_CORE wxRadioBox : public wxControl,
+                                    public wxRadioBoxBase
 {
 public:
+    // ctors and dtor
     wxRadioBox() { Init(); }
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
@@ -42,7 +39,22 @@ public:
         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
 
-    ~wxRadioBox();
+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               int majorDim = 1,
+               long style = wxRA_HORIZONTAL,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr)
+    {
+        Init();
+
+        Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
+    }
+
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -54,37 +66,46 @@ public:
                 long style = wxRA_HORIZONTAL,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                int majorDim = 0,
+                long style = wxRA_HORIZONTAL,
+                const wxValidator& val = wxDefaultValidator,
+                const wxString& name = wxRadioBoxNameStr);
 
-    int FindString( const wxString& s) const;
-    void SetSelection( int n );
-    int GetSelection() const;
+    virtual ~wxRadioBox();
 
-    wxString GetString( int n ) const;
-    void SetString( int n, const wxString& label );
 
-    void Show( int item, bool show );
-    void Enable( int item, bool enable );
+    // implement wxItemContainerImmutable methods
+    virtual unsigned int GetCount() const;
 
-    virtual wxString GetStringSelection() const;
-    virtual bool SetStringSelection( const wxString& s );
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);
 
-    int GetCount() const;
-    int GetNumberOfRowsOrCols() const;
-    void SetNumberOfRowsOrCols( int n );
+    virtual void SetSelection(int n);
+    virtual int GetSelection() const;
 
-    // for compatibility only, don't use these methods in new code!
-#if WXWIN_COMPATIBILITY_2_2
-    int Number() const { return GetCount(); }
-    wxString GetLabel(int n) const { return GetString(n); }
-    void SetLabel( int item, const wxString& label )
-        { SetString(item, label); }
-#endif // WXWIN_COMPATIBILITY_2_2
 
-    // we have to override those to avoid virtual function name hiding
-    wxString GetLabel() const { return wxControl::GetLabel(); }
-    void SetLabel( const wxString& label );
-    bool Show( bool show );
-    bool Enable( bool enable );
+    // implement wxRadioBoxBase methods
+    virtual bool Show(unsigned int n, bool show = true);
+    virtual bool Enable(unsigned int n, bool enable = true);
+
+    virtual bool IsItemEnabled(unsigned int n) const;
+    virtual bool IsItemShown(unsigned int n) const;
+
+
+    // override some base class methods to operate on radiobox itself too
+    virtual bool Show( bool show = true );
+    virtual bool Enable( bool enable = true );
+
+    virtual void SetLabel( const wxString& label );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // implementation
     // --------------
@@ -93,21 +114,22 @@ public:
     void GtkDisableEvents();
     void GtkEnableEvents();
     bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();
 #if wxUSE_TOOLTIPS
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
-    wxSize LayoutItems();
 
-    virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
     virtual void OnInternalIdle();
 
     bool             m_hasFocus,
                      m_lostFocus;
-    int              m_majorDim;
     wxList           m_boxes;
 
 protected:
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+
+    virtual bool GTKWidgetNeedsMnemonic() const;
+    virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
+
     // common part of all ctors
     void Init();
 
@@ -115,4 +137,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 
-#endif // __GTKRADIOBOXH__
+#endif // _WX_GTK_RADIOBOX_H_