Bo's patch for generic code, more sorting code, WIP

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

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 97a318bdcd09d93dd72e9a85514204ae2508d039..1cfd1762407659a43c366a051c37c1691087f5af 100644 (file)
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -7,23 +7,27 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_RADIOBOX_H_
+#define _WX_GTK_RADIOBOX_H_

 
 

-#ifndef __GTKRADIOBOXH__
-#define __GTKRADIOBOXH__
+#include "wx/bitmap.h"

 
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
+class WXDLLIMPEXP_FWD_CORE wxGTKRadioButtonInfo;
+
+#include "wx/list.h"
+
+WX_DECLARE_EXPORTED_LIST(wxGTKRadioButtonInfo, wxRadioBoxButtonsInfoList);

 
 

-#include "wx/bitmap.h"

 
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 

-class 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,


@@ -42,7 +46,22 @@ 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 );
     }
 

-    virtual ~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,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,


@@ -54,37 +73,57 @@ public:
                 long style = wxRA_HORIZONTAL,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
                 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);
+
+    virtual ~wxRadioBox();
+
+
+    // implement wxItemContainerImmutable methods
+    virtual unsigned int GetCount() const;
+
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);

 
 

-    int FindString( const wxString& s) const;
-    void SetSelection( int n );
-    int GetSelection() const;
+    virtual void SetSelection(int n);
+    virtual int GetSelection() const;

 
 

-    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 wxRadioBoxBase methods
+    virtual bool Show(unsigned int n, bool show = true);
+    virtual bool Enable(unsigned int n, bool enable = true);

 
 

-    virtual wxString GetStringSelection() const;
-    virtual bool SetStringSelection( const wxString& s );
+    virtual bool IsItemEnabled(unsigned int n) const;
+    virtual bool IsItemShown(unsigned int n) const;

 
 

-    int GetCount() const;
-    int GetNumberOfRowsOrCols() const;
-    void SetNumberOfRowsOrCols( int n );

 
 

-    // 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
+    // override some base class methods to operate on radiobox itself too
+    virtual bool Show( bool show = true );
+    virtual bool Enable( bool enable = true );

 
 

-    // we have to override those to avoid virtual function name hiding
-    virtual wxString GetLabel() const { return wxControl::GetLabel(); }

     virtual void SetLabel( const wxString& label );
     virtual void SetLabel( const wxString& label );

-    virtual bool Show( bool show = TRUE );
-    virtual bool Enable( bool enable = TRUE );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    virtual int GetItemFromPoint( const wxPoint& pt ) const;
+#if wxUSE_HELP
+    // override virtual wxWindow::GetHelpTextAtPoint to use common platform independent
+    // wxRadioBoxBase::DoGetHelpTextAtPoint from the platform independent
+    // base class-interface wxRadioBoxBase.
+    virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const
+    {
+        return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin );
+    }
+#endif // wxUSE_HELP

 
     // implementation
     // --------------
 
     // implementation
     // --------------


@@ -92,22 +131,27 @@ public:
     void SetFocus();
     void GtkDisableEvents();
     void GtkEnableEvents();
     void SetFocus();
     void GtkDisableEvents();
     void GtkEnableEvents();

-    bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-    void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
+    void ApplyToolTip( GtkTooltips *tips, const gchar *tip );

 #endif // wxUSE_TOOLTIPS
 #endif // wxUSE_TOOLTIPS

-    wxSize LayoutItems();

 
 

-    virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );

     virtual void OnInternalIdle();
 
     virtual void OnInternalIdle();
 

-    bool             m_hasFocus,
-                     m_lostFocus;
-    int              m_majorDim;
-    wxList           m_boxes;
+    bool                        m_hasFocus,
+                                m_lostFocus;
+    wxRadioBoxButtonsInfoList   m_buttonsInfo;

 
 protected:
 
 protected:

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

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


@@ -115,4 +159,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 

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