correct idle tag type; remove unneeded includes

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

diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index 79b607ebbbd1578960498f7fcce0b178bcfb5d8b..60f29cb922cdc61e8a86cf7a746638ef2ad106a0 100644 (file)
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -12,10 +12,6 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "radiobox.h"
-#endif
-
 #include "wx/statbox.h"
 
 class WXDLLEXPORT wxSubwindows;
@@ -63,7 +59,7 @@ public:
                      style, val, name);
     }
 
-    ~wxRadioBox();
+    virtual ~wxRadioBox();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -89,13 +85,13 @@ public:
     // implement the radiobox interface
     virtual void SetSelection(int n);
     virtual int GetSelection() const { return m_selectedButton; }
-    virtual int GetCount() const;
-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& label);
-    virtual bool Enable(int n, bool enable = true);
-    virtual bool Show(int n, bool show = true);
-    virtual int GetColumnCount() const { return GetNumHor(); }
-    virtual int GetRowCount() const { return GetNumVer(); }
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& label);
+    virtual bool Enable(unsigned int n, bool enable = true);
+    virtual bool Show(unsigned int n, bool show = true);
+    virtual bool IsItemEnabled(unsigned int n) const;
+    virtual bool IsItemShown(unsigned int n) const;
 
     // override some base class methods
     virtual bool Show(bool show = true);
@@ -103,9 +99,13 @@ public:
     virtual void SetFocus();
     virtual bool SetFont(const wxFont& font);
     virtual bool ContainsHWND(WXHWND hWnd) const;
+#if wxUSE_TOOLTIPS
+    virtual bool HasToolTips() const;
+#endif // wxUSE_TOOLTIPS
 
-    // we inherit a version returning false from wxStaticBox, override it again
-    virtual bool AcceptsFocus() const { return true; }
+    // we inherit a version always returning false from wxStaticBox, override
+    // it to behave normally
+    virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
 
     void SetLabelFont(const wxFont& WXUNUSED(font)) {}
     void SetButtonFont(const wxFont& font) { SetFont(font); }
@@ -119,10 +119,6 @@ public:
 
     void SendNotificationEvent();
 
-    // get the number of buttons per column/row
-    int GetNumVer() const;
-    int GetNumHor() const;
-
 protected:
     // common part of all ctors
     void Init();
@@ -144,11 +140,22 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
 
+#if wxUSE_TOOLTIPS
+    virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip);
+#endif
+
+    virtual int GetItemFromPoint(const wxPoint& pt) const;
+
+#if wxUSE_HELP
+    // override virtual function with a platform-independent implementation
+    virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const
+    {
+        return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin );
+    }
+#endif // wxUSE_HELP
+
 #ifndef __WXWINCE__
     virtual WXHRGN MSWGetRegionWithoutChildren();
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
-                                    WXWPARAM wParam,
-                                    WXLPARAM lParam);
 #endif // __WXWINCE__
 
 
@@ -160,10 +167,6 @@ protected:
     int *m_radioWidth;
     int *m_radioHeight;
 
-    // the number of elements in major dimension (i.e. number of columns if
-    // wxRA_SPECIFY_COLS or the number of rows if wxRA_SPECIFY_ROWS)
-    int m_majorDim;
-
     // currently selected button or wxNOT_FOUND if none
     int m_selectedButton;