keep {Left,Middle,Right}Down() methods of wxMouseState which were present in 2.9...

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

diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index bba9a528e2eabbe3e762dffa9ccea0c2032dac2a..88db4fbe3e1c176d6e19ccd801c943a17cf163b7 100644 (file)
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/radiobox.h
+// Name:        wx/gtk1/radiobox.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,13 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKRADIOBOXH__
-#define __GTKRADIOBOXH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
+#ifndef _WX_GTK_RADIOBOX_H_
+#define _WX_GTK_RADIOBOX_H_

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


@@ -21,9 +16,11 @@
 // 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,


@@ -41,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,


@@ -57,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,


@@ -80,36 +77,35 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 

-    int FindString( const wxString& s) const;
-    void SetSelection( int n );
-    int GetSelection() const;
+    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);

 
 

-    wxString GetString( int n ) const;
-    void SetString( int n, const wxString& label );
+    virtual void SetSelection(int n);
+    virtual int GetSelection() const;

 
 

-    void Show( int item, bool show );
-    void Enable( int item, bool enable );

 
 

-    virtual wxString GetStringSelection() const;
-    virtual bool SetStringSelection( const wxString& s );
+    // implement wxRadioBoxBase methods
+    virtual bool Show(unsigned int n, bool show = true);
+    virtual bool Enable(unsigned int n, bool enable = true);

 
 

-    int GetCount() const;
-    int GetNumberOfRowsOrCols() const;
-    void SetNumberOfRowsOrCols( int n );
+    virtual bool IsItemEnabled(unsigned int n) const;
+    virtual bool IsItemShown(unsigned int n) 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
-    virtual wxString GetLabel() const { return wxControl::GetLabel(); }
+    // 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 );
     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);

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


@@ -118,18 +114,15 @@ public:
     void GtkDisableEvents();
     void GtkEnableEvents();
     bool IsOwnGtkWindow( GdkWindow *window );
     void GtkDisableEvents();
     void GtkEnableEvents();
     bool IsOwnGtkWindow( GdkWindow *window );

-    void ApplyWidgetStyle();
+    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

-    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;
     virtual void OnInternalIdle();
 
     bool             m_hasFocus,
                      m_lostFocus;

-    int              m_majorDim;

     wxList           m_boxes;
 
 protected:
     wxList           m_boxes;
 
 protected:


@@ -140,4 +133,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 };
 

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