[ 1494561 ] wxComboCtrl vertical size fix.

[wxWidgets.git] / include / wx / gtk / radiobox.h

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 1c9de3b9decd76c024d58129eb02e5feba68ea14..ef0830aad9bf14a09767494fecebcd6079f6cf99 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKRADIOBOXH__
-#define __GTKRADIOBOXH__
+#ifndef _WX_GTK_RADIOBOX_H_
+#define _WX_GTK_RADIOBOX_H_

 
 #include "wx/bitmap.h"
 
 
 #include "wx/bitmap.h"
 


@@ -16,9 +16,11 @@
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 // wxRadioBox
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxRadioBox: public wxControl
+class WXDLLIMPEXP_CORE wxRadioBox : public wxControl,
+                                    public wxRadioBoxBase

 {
 public:
 {
 public:

+    // ctors and dtor

     wxRadioBox() { Init(); }
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
     wxRadioBox() { Init(); }
     wxRadioBox(wxWindow *parent,
                wxWindowID id,


@@ -36,6 +38,7 @@ public:
 
         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }
 
         Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name );
     }

+

     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,


@@ -52,7 +55,6 @@ public:
         Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
     }
 
         Create( parent, id, title, pos, size, choices, majorDim, style, val, name );
     }
 

-    virtual ~wxRadioBox();

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,


@@ -75,27 +77,33 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 

-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    void SetSelection( int n );
-    int GetSelection() const;
+    virtual ~wxRadioBox();

 
 

-    wxString GetString( int n ) const;
-    void SetString( int n, const wxString& label );

 
 

-    virtual bool Show( int item, bool show = true );
-    virtual bool Enable( int item, bool enable = true );
+    // 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;
+    virtual void SetSelection(int n);
+    virtual int GetSelection() const;

 
 

-    // we have to override those to avoid virtual function name hiding
-    virtual wxString GetLabel() const { return wxControl::GetLabel(); }
-    virtual void SetLabel( const wxString& label );
+
+    // 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 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);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 


@@ -106,7 +114,6 @@ public:
     void GtkDisableEvents();
     void GtkEnableEvents();
     bool IsOwnGtkWindow( GdkWindow *window );
     void GtkDisableEvents();
     void GtkEnableEvents();
     bool IsOwnGtkWindow( GdkWindow *window );

-    void DoApplyWidgetStyle(GtkRcStyle *style);

 #if wxUSE_TOOLTIPS
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS


@@ -115,19 +122,23 @@ public:
 
     bool             m_hasFocus,
                      m_lostFocus;
 
     bool             m_hasFocus,
                      m_lostFocus;

-    int              m_majorDim;
-    wxList           m_boxes;
+    wxList           m_buttons;

 
 protected:
 
 protected:

+#if wxUSE_TOOLTIPS
+    virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip);
+#endif
+
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+
+    virtual bool GTKWidgetNeedsMnemonic() const;
+    virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    // check that the index is valid
-    // FIXME: remove once GTK will derive from wxRadioBoxBase
-    inline bool IsValid(int n) const { return n >= 0 && n < GetCount(); }
-

 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 

-#endif // __GTKRADIOBOXH__
+#endif // _WX_GTK_RADIOBOX_H_